diff --git a/qrenderdoc/Styles/RDStyle/RDStyle.cpp b/qrenderdoc/Styles/RDStyle/RDStyle.cpp
index 672bbf254..554d06a70 100644
--- a/qrenderdoc/Styles/RDStyle/RDStyle.cpp
+++ b/qrenderdoc/Styles/RDStyle/RDStyle.cpp
@@ -24,7 +24,6 @@
 
 #include "RDStyle.h"
 #include <QAbstractItemView>
-#include <QBitmap>
 #include <QComboBox>
 #include <QCommonStyle>
 #include <QDebug>
diff --git a/qrenderdoc/Styles/RDStyle/RDStyle.h b/qrenderdoc/Styles/RDStyle/RDStyle.h
index 69320b743..bcfbc250d 100644
--- a/qrenderdoc/Styles/RDStyle/RDStyle.h
+++ b/qrenderdoc/Styles/RDStyle/RDStyle.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QAbstractAnimation>
+#include <QBitmap>
 #include <QPalette>
 #include <QProxyStyle>
 #include "Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.h"
diff --git a/qrenderdoc/Widgets/Extended/RDTableWidget.cpp b/qrenderdoc/Widgets/Extended/RDTableWidget.cpp
index d9e354271..e169e2433 100644
--- a/qrenderdoc/Widgets/Extended/RDTableWidget.cpp
+++ b/qrenderdoc/Widgets/Extended/RDTableWidget.cpp
@@ -26,6 +26,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QDropEvent>
+#include "Code/Interface/QRDInterface.h"
 
 RDTableWidget::RDTableWidget(QWidget *parent) : QTableWidget(parent)
 {
diff --git a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp
index aa94f461a..244e28fa7 100644
--- a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp
+++ b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp
@@ -35,11 +35,11 @@
 #define JSON_ID "rdocPerformanceCounterSettings"
 #define JSON_VER 1
 
-// specialise this template so we can use QSet<GPUCounter>
-template <>
-inline uint qHash(const GPUCounter &t, uint seed)
+// we can't specialise the template, but creating an overload works. This lets us use
+// QSet<GPUCounter>
+inline uint qHash(const GPUCounter &t)
 {
-  return qHash(uint32_t(t), seed);
+  return qHash(uint32_t(t));
 }
 
 namespace
diff --git a/qrenderdoc/Windows/PerformanceCounterViewer.cpp b/qrenderdoc/Windows/PerformanceCounterViewer.cpp
index cfe16c816..c0060f258 100644
--- a/qrenderdoc/Windows/PerformanceCounterViewer.cpp
+++ b/qrenderdoc/Windows/PerformanceCounterViewer.cpp
@@ -64,6 +64,8 @@ struct SortValue
           val.u = result.value.u64;
         else
           val.u = result.value.u32;
+
+      default: break;
     }
   }
 };
diff --git a/renderdoc/core/plugins.cpp b/renderdoc/core/plugins.cpp
index 65cf7d642..2d0341704 100644
--- a/renderdoc/core/plugins.cpp
+++ b/renderdoc/core/plugins.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "core/plugins.h"
+#include "os/os_specific.h"
 #include "serialise/string_utils.h"
 
 std::string LocatePluginFile(const std::string &path, const std::string &fileName)
diff --git a/renderdoc/core/plugins.h b/renderdoc/core/plugins.h
index 25e1b0e91..404851d26 100644
--- a/renderdoc/core/plugins.h
+++ b/renderdoc/core/plugins.h
@@ -22,4 +22,6 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <string>
+
 std::string LocatePluginFile(const std::string &path, const std::string &fileName);
\ No newline at end of file