diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh
index 1dcab55d..bef3c4a5 100644
--- a/include/qbsp/qbsp.hh
+++ b/include/qbsp/qbsp.hh
@@ -370,7 +370,6 @@ struct node_t
     bool opaque() const;
 };
 
-#include <qbsp/solidbsp.hh>
 #include <qbsp/merge.hh>
 #include <qbsp/surfaces.hh>
 #include <qbsp/portals.hh>
diff --git a/include/qbsp/solidbsp.hh b/include/qbsp/solidbsp.hh
index 073b4516..a5c8a531 100644
--- a/include/qbsp/solidbsp.hh
+++ b/include/qbsp/solidbsp.hh
@@ -22,9 +22,14 @@
 #pragma once
 
 #include <atomic>
+#include <list>
 
 extern std::atomic<int> splitnodes;
 
+struct node_t;
+struct face_t;
+class mapentity_t;
+
 void DetailToSolid(node_t *node);
 std::list<face_t *>::iterator SubdivideFace(std::list<face_t *>::iterator it, std::list<face_t *> &surfaces);
 node_t *SolidBSP(mapentity_t *entity, bool midsplit);
diff --git a/qbsp/portals.cc b/qbsp/portals.cc
index ffd591be..1a5fc861 100644
--- a/qbsp/portals.cc
+++ b/qbsp/portals.cc
@@ -22,6 +22,8 @@
 
 #include <fstream>
 #include <fmt/ostream.h>
+
+#include <qbsp/solidbsp.hh>
 #include <qbsp/qbsp.hh>
 
 node_t outside_node; // portals outside the world face this
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index ab64f2a6..baca346c 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -29,6 +29,7 @@
 #include <common/threads.hh>
 #include <common/settings.hh>
 #include <qbsp/brush.hh>
+#include <qbsp/solidbsp.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/wad.hh>
 #include <fmt/chrono.h>
diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc
index 2631b127..1820a982 100644
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@@ -22,6 +22,7 @@
 #include <qbsp/qbsp.hh>
 #include <qbsp/csg4.hh>
 #include <qbsp/brush.hh>
+#include <qbsp/solidbsp.hh>
 
 #include <map>
 #include <list>