diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 50e0efc9fa..6a9d908c37 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -42,7 +42,7 @@ const QString DESCRIPTION_COLUMNS_KEY = "columns";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
-static const Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
+static Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
 
 DomainServerSettingsManager::DomainServerSettingsManager() :
     _descriptionArray(),
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index c067377ffc..6012e6706c 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -14,6 +14,7 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
+#include <QtNetwork/QNetworkReply>
 
 #include <HifiConfigVariantMap.h>
 #include <HTTPManager.h>
@@ -21,6 +22,8 @@
 #include <ReceivedMessage.h>
 #include "NodePermissions.h"
 
+#include <Node.h>
+
 const QString SETTINGS_PATHS_KEY = "paths";
 
 const QString SETTINGS_PATH = "/settings";
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 19346e51db..90d7cf4665 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -57,7 +57,6 @@
 
 using namespace std;
 
-const glm::vec3 DEFAULT_UP_DIRECTION(0.0f, 1.0f, 0.0f);
 const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f;
 
 const float MAX_WALKING_SPEED = 2.6f; // human walking speed
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 85a630ee07..53b81578b6 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -18,6 +18,7 @@
 #include <QSharedMemory>
 #include <QTranslator>
 
+#include <BuildInfo.h>
 #include <gl/OpenGLVersionChecker.h>
 #include <SharedUtil.h>
 
@@ -30,7 +31,6 @@
 #include "MainWindow.h"
 #include <QtCore/QProcess>
 
-#include <BuildInfo.h>
 #ifdef HAS_BUGSPLAT
 #include <BugSplat.h>
 #include <CrashReporter.h>
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 877c6c3e91..94410470ce 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -956,10 +956,6 @@ void Rig::updateFromEyeParameters(const EyeParameters& params) {
                    params.worldHeadOrientation, params.eyeLookAt, params.eyeSaccade);
 }
 
-static const glm::vec3 X_AXIS(1.0f, 0.0f, 0.0f);
-static const glm::vec3 Y_AXIS(0.0f, 1.0f, 0.0f);
-static const glm::vec3 Z_AXIS(0.0f, 0.0f, 1.0f);
-
 void Rig::computeHeadNeckAnimVars(const AnimPose& hmdPose, glm::vec3& headPositionOut, glm::quat& headOrientationOut,
                                   glm::vec3& neckPositionOut, glm::quat& neckOrientationOut) const {
 
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index 21c0d7c721..dd2b2fc595 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -21,8 +21,6 @@
 #include "SettingManager.h"
 #include "SharedLogging.h"
 
-
-
 namespace Setting {
     static QSharedPointer<Manager> globalManager;
 
diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp
index 8abb9f54e5..37983f178d 100644
--- a/tests/render-perf/src/main.cpp
+++ b/tests/render-perf/src/main.cpp
@@ -18,6 +18,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QRegularExpression>
+#include <QtCore/QSettings>
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
 #include <QtCore/QThreadPool>
diff --git a/tests/render-texture-load/src/GLIHelpers.cpp b/tests/render-texture-load/src/GLIHelpers.cpp
index 8067993b49..be39e7f1c8 100644
--- a/tests/render-texture-load/src/GLIHelpers.cpp
+++ b/tests/render-texture-load/src/GLIHelpers.cpp
@@ -48,7 +48,7 @@ QString convertTexture(const QString& sourceFile) {
         fromQImageFormat(sourceImage.format()), 
         gli::extent2d(sourceImage.width(), sourceImage.height()));
     auto sourceSize = sourceImage.byteCount();
-    assert(sourceSize == workTexture[workTexture.base_level()].size());
+    assert(sourceSize == (int)workTexture[workTexture.base_level()].size());
     memcpy(workTexture[workTexture.base_level()].data(), sourceImage.constBits(), sourceSize);
 
     QString resultFile = getKtxFileName(sourceFile) ;
diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp
index c38bd6765c..7e909bf31f 100644
--- a/tests/render-utils/src/main.cpp
+++ b/tests/render-utils/src/main.cpp
@@ -152,7 +152,6 @@ protected:
 
 //static const wchar_t* EXAMPLE_TEXT = L"Hello";
 //static const wchar_t* EXAMPLE_TEXT = L"\xC1y Hello 1.0\ny\xC1 line 2\n\xC1y";
-static const glm::uvec2 QUAD_OFFSET(10, 10);
 
 void testShaderBuild(const char* vs_src, const char * fs_src) {
     auto vs = gpu::Shader::createVertex(std::string(vs_src));