diff --git a/qrenderdoc/Widgets/CustomPaintWidget.cpp b/qrenderdoc/Widgets/CustomPaintWidget.cpp
index f28ce72e5..4f43eb3d5 100644
--- a/qrenderdoc/Widgets/CustomPaintWidget.cpp
+++ b/qrenderdoc/Widgets/CustomPaintWidget.cpp
@@ -25,6 +25,7 @@
 #include "CustomPaintWidget.h"
 #include <math.h>
 #include <QPainter>
+#include "Code/Interface/QRDInterface.h"
 
 CustomPaintWidget::CustomPaintWidget(QWidget *parent) : QWidget(parent)
 {
diff --git a/qrenderdoc/Windows/APIInspector.h b/qrenderdoc/Windows/APIInspector.h
index a74793da1..7106fd169 100644
--- a/qrenderdoc/Windows/APIInspector.h
+++ b/qrenderdoc/Windows/APIInspector.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 1f8f6d13b..09413e883 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -26,6 +26,7 @@
 #include <float.h>
 #include <QDoubleSpinBox>
 #include <QFontDatabase>
+#include <QItemSelection>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QMutexLocker>
diff --git a/qrenderdoc/Windows/BufferViewer.h b/qrenderdoc/Windows/BufferViewer.h
index 1b9efd785..a2991aac2 100644
--- a/qrenderdoc/Windows/BufferViewer.h
+++ b/qrenderdoc/Windows/BufferViewer.h
@@ -26,12 +26,16 @@
 
 #include <QFrame>
 #include <QMutex>
+#include "Code/Interface/QRDInterface.h"
+#include "Code/QRDUtils.h"
 
 namespace Ui
 {
 class BufferViewer;
 }
 
+class QItemSelection;
+class QMenu;
 class RDTableView;
 class BufferItemModel;
 class CameraWrapper;
diff --git a/qrenderdoc/Windows/CommentView.h b/qrenderdoc/Windows/CommentView.h
index e7a2c9f98..bf614d57c 100644
--- a/qrenderdoc/Windows/CommentView.h
+++ b/qrenderdoc/Windows/CommentView.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
index 3408769ff..c3c3b38d2 100644
--- a/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
+++ b/qrenderdoc/Windows/ConstantBufferPreviewer.cpp
@@ -24,6 +24,7 @@
 
 #include "ConstantBufferPreviewer.h"
 #include <QFontDatabase>
+#include <QTextStream>
 #include "3rdparty/toolwindowmanager/ToolWindowManager.h"
 #include "ui_ConstantBufferPreviewer.h"
 
diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.h b/qrenderdoc/Windows/ConstantBufferPreviewer.h
index 5e23f76d0..0a81826e1 100644
--- a/qrenderdoc/Windows/ConstantBufferPreviewer.h
+++ b/qrenderdoc/Windows/ConstantBufferPreviewer.h
@@ -25,12 +25,14 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
 class ConstantBufferPreviewer;
 }
 
+class QTextStream;
 class RDTreeWidgetItem;
 struct FormatElement;
 
diff --git a/qrenderdoc/Windows/DebugMessageView.cpp b/qrenderdoc/Windows/DebugMessageView.cpp
index 56d6c95f1..683a20456 100644
--- a/qrenderdoc/Windows/DebugMessageView.cpp
+++ b/qrenderdoc/Windows/DebugMessageView.cpp
@@ -25,6 +25,7 @@
 #include "DebugMessageView.h"
 #include <QAction>
 #include <QMenu>
+#include "Code/QRDUtils.h"
 #include "ui_DebugMessageView.h"
 
 static const int EIDRole = Qt::UserRole + 1;
diff --git a/qrenderdoc/Windows/DebugMessageView.h b/qrenderdoc/Windows/DebugMessageView.h
index 2c1aac39b..71f449505 100644
--- a/qrenderdoc/Windows/DebugMessageView.h
+++ b/qrenderdoc/Windows/DebugMessageView.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.h b/qrenderdoc/Windows/Dialogs/CaptureDialog.h
index cd009266f..9b12dc6e5 100644
--- a/qrenderdoc/Windows/Dialogs/CaptureDialog.h
+++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.h
@@ -26,6 +26,7 @@
 
 #include <QFrame>
 #include <functional>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
index 666455704..704207e94 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
@@ -33,6 +33,7 @@
 #include <QToolBar>
 #include <QToolButton>
 #include "3rdparty/toolwindowmanager/ToolWindowManager.h"
+#include "Code/QRDUtils.h"
 #include "Code/Resources.h"
 #include "Code/qprocessinfo.h"
 #include "Widgets/Extended/RDLabel.h"
diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.h b/qrenderdoc/Windows/Dialogs/LiveCapture.h
index 5544a770b..87944e5dd 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.h
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.h
@@ -24,10 +24,12 @@
 
 #pragma once
 
+#include <QDateTime>
 #include <QFrame>
 #include <QMutex>
 #include <QSemaphore>
 #include <QTimer>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
@@ -38,6 +40,8 @@ class QSplitter;
 class QAction;
 class QToolButton;
 class QListWidgetItem;
+class QMenu;
+class LambdaThread;
 class RDLabel;
 class MainWindow;
 class QKeyEvent;
diff --git a/qrenderdoc/Windows/Dialogs/TipsDialog.cpp b/qrenderdoc/Windows/Dialogs/TipsDialog.cpp
index cf0412119..69f3ca9c7 100644
--- a/qrenderdoc/Windows/Dialogs/TipsDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/TipsDialog.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "TipsDialog.h"
+#include "Code/QRDUtils.h"
 #include "ui_TipsDialog.h"
 
 #include <stdlib.h>
diff --git a/qrenderdoc/Windows/Dialogs/TipsDialog.h b/qrenderdoc/Windows/Dialogs/TipsDialog.h
index 4531b4a83..2c447070b 100644
--- a/qrenderdoc/Windows/Dialogs/TipsDialog.h
+++ b/qrenderdoc/Windows/Dialogs/TipsDialog.h
@@ -33,6 +33,8 @@ namespace Ui
 class TipsDialog;
 }
 
+class ICaptureContext;
+
 class TipsDialog : public QDialog
 {
   Q_OBJECT
diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h
index a02ed9675..1ded7bd10 100644
--- a/qrenderdoc/Windows/EventBrowser.h
+++ b/qrenderdoc/Windows/EventBrowser.h
@@ -26,6 +26,7 @@
 
 #include <QFrame>
 #include <QIcon>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 6e1e65f43..42a39c51e 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -26,8 +26,10 @@
 
 #include <stdint.h>
 #include <QMainWindow>
+#include <QSemaphore>
 #include <QTimer>
 #include "3rdparty/toolwindowmanager/ToolWindowManager.h"
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
@@ -35,6 +37,7 @@ class MainWindow;
 }
 
 class RDLabel;
+class LambdaThread;
 class QMimeData;
 class QProgressBar;
 class QToolButton;
diff --git a/qrenderdoc/Windows/PerformanceCounterViewer.cpp b/qrenderdoc/Windows/PerformanceCounterViewer.cpp
index acf658a9e..8ac99fb38 100644
--- a/qrenderdoc/Windows/PerformanceCounterViewer.cpp
+++ b/qrenderdoc/Windows/PerformanceCounterViewer.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "PerformanceCounterViewer.h"
+#include "Code/QRDUtils.h"
 #include "Windows/Dialogs/PerformanceCounterSelection.h"
 #include "ui_PerformanceCounterViewer.h"
 
diff --git a/qrenderdoc/Windows/PerformanceCounterViewer.h b/qrenderdoc/Windows/PerformanceCounterViewer.h
index b05cca527..17f5eeed4 100644
--- a/qrenderdoc/Windows/PerformanceCounterViewer.h
+++ b/qrenderdoc/Windows/PerformanceCounterViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h
index af7450122..3ed3a1a6b 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h
index 631e9ff3c..806a5307c 100644
--- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h
index da6c2e694..0386e4845 100644
--- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
index 5caf6ba6e..875644527 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp
@@ -28,6 +28,7 @@
 #include <QSvgRenderer>
 #include <QXmlStreamWriter>
 #include "3rdparty/toolwindowmanager/ToolWindowManager.h"
+#include "Code/QRDUtils.h"
 #include "Code/Resources.h"
 #include "Widgets/Extended/RDLabel.h"
 #include "D3D11PipelineStateViewer.h"
diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h
index 7e15808d9..41ad2ad11 100644
--- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h
@@ -25,6 +25,8 @@
 #pragma once
 
 #include <QFrame>
+#include <QLabel>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
index 987672404..02d9acf15 100644
--- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
+++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PixelHistoryView.h b/qrenderdoc/Windows/PixelHistoryView.h
index 062421539..94f81c636 100644
--- a/qrenderdoc/Windows/PixelHistoryView.h
+++ b/qrenderdoc/Windows/PixelHistoryView.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/PythonShell.h b/qrenderdoc/Windows/PythonShell.h
index 909c7b038..e59674968 100644
--- a/qrenderdoc/Windows/PythonShell.h
+++ b/qrenderdoc/Windows/PythonShell.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 class PythonContext;
 class ScintillaEdit;
diff --git a/qrenderdoc/Windows/ResourceInspector.h b/qrenderdoc/Windows/ResourceInspector.h
index 9a71d55b3..f01c931bf 100644
--- a/qrenderdoc/Windows/ResourceInspector.h
+++ b/qrenderdoc/Windows/ResourceInspector.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h
index 740719c35..986d05f3a 100644
--- a/qrenderdoc/Windows/ShaderViewer.h
+++ b/qrenderdoc/Windows/ShaderViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/StatisticsViewer.cpp b/qrenderdoc/Windows/StatisticsViewer.cpp
index 418a06aa1..2852e4c2b 100644
--- a/qrenderdoc/Windows/StatisticsViewer.cpp
+++ b/qrenderdoc/Windows/StatisticsViewer.cpp
@@ -24,6 +24,7 @@
 
 #include "StatisticsViewer.h"
 #include <QFontDatabase>
+#include "Code/QRDUtils.h"
 #include "ui_StatisticsViewer.h"
 
 static const int HistogramWidth = 128;
diff --git a/qrenderdoc/Windows/StatisticsViewer.h b/qrenderdoc/Windows/StatisticsViewer.h
index f6a22d2bf..b06557468 100644
--- a/qrenderdoc/Windows/StatisticsViewer.h
+++ b/qrenderdoc/Windows/StatisticsViewer.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QFrame>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h
index 7a70cb249..fe0293723 100644
--- a/qrenderdoc/Windows/TextureViewer.h
+++ b/qrenderdoc/Windows/TextureViewer.h
@@ -27,6 +27,7 @@
 #include <QFrame>
 #include <QMenu>
 #include <QMouseEvent>
+#include "Code/Interface/QRDInterface.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/TimelineBar.cpp b/qrenderdoc/Windows/TimelineBar.cpp
index 1b20ec194..d2f3e11b0 100644
--- a/qrenderdoc/Windows/TimelineBar.cpp
+++ b/qrenderdoc/Windows/TimelineBar.cpp
@@ -27,6 +27,7 @@
 #include <QPainter>
 #include <QScrollBar>
 #include <QWheelEvent>
+#include "Code/QRDUtils.h"
 #include "Code/Resources.h"
 
 QPointF aliasAlign(QPointF pt)
diff --git a/qrenderdoc/Windows/TimelineBar.h b/qrenderdoc/Windows/TimelineBar.h
index 796f4d9ce..399b8728a 100644
--- a/qrenderdoc/Windows/TimelineBar.h
+++ b/qrenderdoc/Windows/TimelineBar.h
@@ -25,6 +25,7 @@
 #pragma once
 
 #include <QAbstractScrollArea>
+#include "Code/Interface/QRDInterface.h"
 
 class TimelineBar : public QAbstractScrollArea, public ITimelineBar, public ICaptureViewer
 {