diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 7a5ad26726..709f318d2c 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QtCore/QProcess>
-#include <QtCore/qsharedmemory.h>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QProcess>
+#include <QSettings>
+#include <QSharedMemory>
+#include <QThread>
+#include <QTimer>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 791c7e37b6..135c92d302 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -13,21 +13,22 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonArray>
-#include <QtCore/QProcess>
-#include <QtCore/qsharedmemory.h>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QTimer>
-#include <QtCore/QUrlQuery>
+#include <QDir>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QProcess>
+#include <QSharedMemory>
+#include <QStandardPaths>
+#include <QTimer>
+#include <QUrlQuery>
 
 #include <AccountManager.h>
 #include <HifiConfigVariantMap.h>
 #include <HTTPConnection.h>
 #include <LogUtils.h>
 #include <PacketHeaders.h>
+#include <Settings.h>
 #include <SharedUtil.h>
 #include <ShutdownEventListener.h>
 #include <UUID.h>
@@ -1943,7 +1944,7 @@ Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileR
 
 void DomainServer::loadExistingSessionsFromSettings() {
     // read data for existing web sessions into memory so existing sessions can be leveraged
-    QSettings domainServerSettings;
+    Settings domainServerSettings;
     domainServerSettings.beginGroup(DS_SETTINGS_SESSIONS_GROUP);
     
     foreach(const QString& uuidKey, domainServerSettings.childKeys()) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index f3b5b9a696..dc1ace664c 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -19,7 +19,6 @@
 #include <QImage>
 #include <QPointer>
 #include <QSet>
-#include <QSettings>
 #include <QStringList>
 #include <QUndoStack>
 
diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h
index 2dffbf72f5..d44213c070 100644
--- a/interface/src/LODManager.h
+++ b/interface/src/LODManager.h
@@ -12,8 +12,6 @@
 #ifndef hifi_LODManager_h
 #define hifi_LODManager_h
 
-#include <QSettings>
-
 #include <DependencyManager.h>
 #include <OctreeConstants.h>
 #include <SharedUtil.h>
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 2bb0633f24..dae32b67c6 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -8,13 +8,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
-
 #include <QDebug>
 #include <QDir>
+#include <QSettings>
 #include <QTranslator>
+
 #include <SharedUtil.h>
 
+#include "Application.h"
+
 int main(int argc, const char * argv[]) {
     QElapsedTimer startupTime;
     startupTime.start();
diff --git a/interface/src/ui/RearMirrorTools.h b/interface/src/ui/RearMirrorTools.h
index 55ac83afec..f899c7a3c8 100644
--- a/interface/src/ui/RearMirrorTools.h
+++ b/interface/src/ui/RearMirrorTools.h
@@ -15,7 +15,6 @@
 #include "InterfaceConfig.h"
 
 #include <QGLWidget>
-#include <QSettings>
 
 enum ZoomLevel {
     HEAD,
diff --git a/libraries/metavoxels/src/MetavoxelUtil.cpp b/libraries/metavoxels/src/MetavoxelUtil.cpp
index cdeec61500..f887ca744b 100644
--- a/libraries/metavoxels/src/MetavoxelUtil.cpp
+++ b/libraries/metavoxels/src/MetavoxelUtil.cpp
@@ -19,11 +19,11 @@
 #include <QMetaType>
 #include <QPushButton>
 #include <QScriptEngine>
-#include <QSettings>
 #include <QVBoxLayout>
 #include <QtDebug>
 
 #include <GLMHelpers.h>
+#include <Settings.h>
 
 #include "MetavoxelUtil.h"
 #include "ScriptCache.h"
@@ -492,7 +492,7 @@ QUrlEditor::QUrlEditor(QWidget* parent) :
     setInsertPolicy(InsertAtTop);
     
     // populate initial URL list from settings
-    addItems(QSettings().value("editorURLs").toStringList());
+    addItems(Settings().value("editorURLs").toStringList());
     
     connect(this, SIGNAL(activated(const QString&)), SLOT(updateURL(const QString&)));
     connect(model(), SIGNAL(rowsInserted(const QModelIndex&,int,int)), SLOT(updateSettings()));
@@ -512,7 +512,7 @@ void QUrlEditor::updateSettings() {
     for (int i = 0, size = qMin(MAX_STORED_URLS, count()); i < size; i++) {
         urls.append(itemText(i));
     }
-    QSettings().setValue("editorURLs", urls);
+    Settings().setValue("editorURLs", urls);
 }
 
 BaseVec3Editor::BaseVec3Editor(QWidget* parent) : QWidget(parent) {
diff --git a/libraries/metavoxels/src/Spanner.cpp b/libraries/metavoxels/src/Spanner.cpp
index 30bc1f5a59..8ea8dc2e6f 100644
--- a/libraries/metavoxels/src/Spanner.cpp
+++ b/libraries/metavoxels/src/Spanner.cpp
@@ -17,12 +17,12 @@
 #include <QItemEditorFactory>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QSettings>
 #include <QThread>
 
 #include <glm/gtx/transform.hpp>
 
 #include <GeometryUtil.h>
+#include <Settings.h>
 
 #include "MetavoxelData.h"
 #include "Spanner.h"
@@ -606,7 +606,7 @@ static int getHeightfieldSize(int size) {
 }
 
 void HeightfieldHeightEditor::select() {
-    QSettings settings;
+    Settings settings;
     QString result = QFileDialog::getOpenFileName(this, "Select Height Image", settings.value("heightDir").toString(),
         "Images (*.png *.jpg *.bmp *.raw *.mdr)");
     if (result.isNull()) {
@@ -916,7 +916,7 @@ void HeightfieldColorEditor::setColor(const HeightfieldColorPointer& color) {
 }
 
 void HeightfieldColorEditor::select() {
-    QSettings settings;
+    Settings settings;
     QString result = QFileDialog::getOpenFileName(this, "Select Color Image", settings.value("heightDir").toString(),
         "Images (*.png *.jpg *.bmp)");
     if (result.isNull()) {
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 0c63ecc731..3a3ae598c7 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -21,6 +21,8 @@
 #include <QtNetwork/QNetworkRequest>
 #include <qthread.h>
 
+#include <Settings.h>
+
 #include "NodeList.h"
 #include "PacketHeaders.h"
 #include "RSAKeypairGenerator.h"
@@ -88,7 +90,7 @@ void AccountManager::logout() {
     connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged);
     
     if (_shouldPersistToSettingsFile) {
-        QSettings settings;
+        Settings settings;
         settings.beginGroup(ACCOUNTS_GROUP);
         
         QString keyURLString(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE));
@@ -127,7 +129,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
         
         if (_shouldPersistToSettingsFile) {
             // check if there are existing access tokens to load from settings
-            QSettings settings;
+            Settings settings;
             settings.beginGroup(ACCOUNTS_GROUP);
             
             foreach(const QString& key, settings.allKeys()) {
@@ -322,7 +324,7 @@ void AccountManager::passErrorToCallback(QNetworkReply* requestReply) {
 void AccountManager::persistAccountToSettings() {
     if (_shouldPersistToSettingsFile) {
         // store this access token into the local settings
-        QSettings localSettings;
+        Settings localSettings;
         localSettings.beginGroup(ACCOUNTS_GROUP);
         localSettings.setValue(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE),
                                QVariant::fromValue(_accountInfo));
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 0c32e9fa6e..ea1f413b29 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -17,6 +17,7 @@
 #include <QStringList>
 
 #include <GLMHelpers.h>
+#include <Settings.h>
 #include <UUID.h>
 
 #include "NodeList.h"
@@ -51,7 +52,7 @@ const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
 
 void AddressManager::loadSettings(const QString& lookupString) {
     if (lookupString.isEmpty()) {
-        QSettings settings;
+        Settings settings;
         settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP);
         handleLookupString(settings.value(SETTINGS_CURRENT_ADDRESS_KEY).toString());
     } else {
@@ -60,7 +61,7 @@ void AddressManager::loadSettings(const QString& lookupString) {
 }
 
 void AddressManager::storeCurrentAddress() {
-    QSettings settings;
+    Settings settings;
 
     settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP);
     settings.setValue(SETTINGS_CURRENT_ADDRESS_KEY, currentAddress());
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 6128c0f7c9..907fccfcac 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -23,7 +23,6 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QMutex>
 #include <QtCore/QSet>
-#include <QtCore/QSettings>
 #include <QtCore/QSharedPointer>
 #include <QtNetwork/QHostAddress>
 #include <QtNetwork/QUdpSocket>
diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp
index 747a05e90a..ba4a0a1c8f 100644
--- a/libraries/octree/src/JurisdictionMap.cpp
+++ b/libraries/octree/src/JurisdictionMap.cpp
@@ -9,9 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QtCore/QSettings>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QSettings>
+#include <QString>
+#include <QStringList>
 #include <QDebug>
 
 #include <PacketHeaders.h>
@@ -209,9 +209,9 @@ JurisdictionMap::Area JurisdictionMap::isMyJurisdiction(const unsigned char* nod
 
 
 bool JurisdictionMap::readFromFile(const char* filename) {
-    QString     settingsFile(filename);
-    QSettings   settings(settingsFile, QSettings::IniFormat);
-    QString     rootCode = settings.value("root","00").toString();
+    QString settingsFile(filename);
+    QSettings settings(settingsFile, QSettings::IniFormat);
+    QString rootCode = settings.value("root","00").toString();
     qDebug() << "rootCode=" << rootCode;
 
     _rootOctalCode = hexStringToOctalCode(rootCode);