diff --git a/qrenderdoc/3rdparty/scintilla/include/qt/ScintillaEditBase.h b/qrenderdoc/3rdparty/scintilla/include/qt/ScintillaEditBase.h
index 7c52e5690..a7ba73427 100644
--- a/qrenderdoc/3rdparty/scintilla/include/qt/ScintillaEditBase.h
+++ b/qrenderdoc/3rdparty/scintilla/include/qt/ScintillaEditBase.h
@@ -12,8 +12,8 @@
 #ifndef SCINTILLAEDITBASE_H
 #define SCINTILLAEDITBASE_H
 
-#include "Platform.h"
-#include "Scintilla.h"
+#include "../Platform.h"
+#include "../Scintilla.h"
 
 #include <QAbstractScrollArea>
 #include <QMimeData>
diff --git a/qrenderdoc/Code/ScintillaSyntax.cpp b/qrenderdoc/Code/ScintillaSyntax.cpp
index d7d06b91f..3d4ddeedb 100644
--- a/qrenderdoc/Code/ScintillaSyntax.cpp
+++ b/qrenderdoc/Code/ScintillaSyntax.cpp
@@ -23,8 +23,8 @@
  ******************************************************************************/
 
 #include "ScintillaSyntax.h"
-#include "SciLexer.h"
-#include "ScintillaEdit.h"
+#include "3rdparty/scintilla/include/SciLexer.h"
+#include "3rdparty/scintilla/include/qt/ScintillaEdit.h"
 
 static const char *hlsl_keywords[2] = {
     // keyword set 0:
diff --git a/qrenderdoc/Windows/BufferViewer.ui b/qrenderdoc/Windows/BufferViewer.ui
index 0cf42aa53..14b1f03d2 100644
--- a/qrenderdoc/Windows/BufferViewer.ui
+++ b/qrenderdoc/Windows/BufferViewer.ui
@@ -774,7 +774,7 @@
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
-   <header>ToolWindowManager.h</header>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
   </customwidget>
   <customwidget>
    <class>BufferFormatSpecifier</class>
diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
index 0a02f10c9..cbbaaa83a 100644
--- a/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
@@ -25,12 +25,12 @@
 #include "CaptureDialog.h"
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
+#include "3rdparty/flowlayout/FlowLayout.h"
+#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
 #include "Code/QRDUtils.h"
 #include "Code/qprocessinfo.h"
 #include "Windows/Dialogs/VirtualFileDialog.h"
-#include "FlowLayout.h"
 #include "LiveCapture.h"
-#include "ToolWindowManager.h"
 #include "ui_CaptureDialog.h"
 
 #define JSON_ID "rdocCaptureSettings"
diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
index f7256f48f..e41e192d6 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
@@ -30,10 +30,10 @@
 #include <QScrollBar>
 #include <QToolBar>
 #include <QToolButton>
+#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
 #include "Code/qprocessinfo.h"
 #include "Widgets/Extended/RDLabel.h"
 #include "Windows/MainWindow.h"
-#include "ToolWindowManager.h"
 #include "ui_LiveCapture.h"
 
 static const int PIDRole = Qt::UserRole + 1;
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 529047d47..3e79e6591 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <QMainWindow>
 #include <QTimer>
+#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
 #include "Code/CaptureContext.h"
-#include "ToolWindowManager.h"
 
 namespace Ui
 {
diff --git a/qrenderdoc/Windows/MainWindow.ui b/qrenderdoc/Windows/MainWindow.ui
index b90b989b8..04bc1cfa0 100644
--- a/qrenderdoc/Windows/MainWindow.ui
+++ b/qrenderdoc/Windows/MainWindow.ui
@@ -401,7 +401,7 @@
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
-   <header>ToolWindowManager.h</header>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 564aa3d61..dbf45345a 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -24,10 +24,10 @@
 
 #include "ShaderViewer.h"
 #include <QHBoxLayout>
+#include "3rdparty/scintilla/include/SciLexer.h"
+#include "3rdparty/scintilla/include/qt/ScintillaEdit.h"
 #include "3rdparty/toolwindowmanager/ToolWindowManager.h"
 #include "Code/ScintillaSyntax.h"
-#include "SciLexer.h"
-#include "ScintillaEdit.h"
 #include "ui_ShaderViewer.h"
 
 ShaderViewer::ShaderViewer(CaptureContext *ctx, ShaderReflection *shader, ShaderStageType stage,
diff --git a/qrenderdoc/Windows/ShaderViewer.ui b/qrenderdoc/Windows/ShaderViewer.ui
index d62c03e06..e93047b46 100644
--- a/qrenderdoc/Windows/ShaderViewer.ui
+++ b/qrenderdoc/Windows/ShaderViewer.ui
@@ -190,7 +190,7 @@
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
-   <header>ToolWindowManager.h</header>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index f34821d6b..6a16910af 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -33,6 +33,7 @@
 #include <QMenu>
 #include <QPainter>
 #include <QStyledItemDelegate>
+#include "3rdparty/flowlayout/FlowLayout.h"
 #include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h"
 #include "Code/CaptureContext.h"
 #include "Code/QRDUtils.h"
@@ -40,7 +41,6 @@
 #include "Widgets/ResourcePreview.h"
 #include "Widgets/TextureGoto.h"
 #include "BufferViewer.h"
-#include "FlowLayout.h"
 #include "MainWindow.h"
 #include "ui_TextureViewer.h"
 
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index a3d71bd58..6b327dec6 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -1205,7 +1205,7 @@
   <customwidget>
    <class>ToolWindowManager</class>
    <extends>QWidget</extends>
-   <header>ToolWindowManager.h</header>
+   <header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
   </customwidget>
   <customwidget>
    <class>CustomPaintWidget</class>