diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh
index 066ef024..cfc19a7a 100644
--- a/include/qbsp/qbsp.hh
+++ b/include/qbsp/qbsp.hh
@@ -284,7 +284,6 @@ enum
 
 #include <common/cmdlib.hh>
 #include <common/mathlib.hh>
-#include <qbsp/winding.hh>
 
 struct mtexinfo_t
 {
@@ -370,7 +369,4 @@ struct node_t
     bool opaque() const;
 };
 
-#include <qbsp/writebsp.hh>
-#include <qbsp/outside.hh>
-
 int qbsp_main(int argc, const char **argv);
diff --git a/include/qbsp/surfaces.hh b/include/qbsp/surfaces.hh
index bdf2aac9..be0d1268 100644
--- a/include/qbsp/surfaces.hh
+++ b/include/qbsp/surfaces.hh
@@ -23,6 +23,9 @@
 
 #include <list>
 
-void FreeNodes(node_t* node);
+struct node_t;
+class mapentity_t;
+
+void FreeNodes(node_t *node);
 void MakeVisibleFaces(mapentity_t *entity, node_t *headnode);
 void MakeMarkFaces(mapentity_t* entity, node_t* headnode);
diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc
index a8911d42..163eeb46 100644
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@@ -37,6 +37,8 @@
 #include <qbsp/surfaces.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/wad.hh>
+#include <qbsp/writebsp.hh>
+#include <qbsp/outside.hh>
 
 #include <fmt/chrono.h>
 
diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc
index 1fc92889..562a827f 100644
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@@ -25,6 +25,7 @@
 #include <qbsp/map.hh>
 #include <qbsp/solidbsp.hh>
 #include <qbsp/qbsp.hh>
+#include <qbsp/writebsp.hh>
 
 #include <map>
 #include <list>