diff --git a/include/qbsp/csg4.hh b/include/qbsp/csg4.hh
index 7a284569..580a15b5 100644
--- a/include/qbsp/csg4.hh
+++ b/include/qbsp/csg4.hh
@@ -21,9 +21,13 @@
 
 #pragma once
 
+#include <common/qvec.hh>
+
 #include <list>
 #include <tuple>
 
+struct face_t;
+
 int MakeSkipTexinfo();
 face_t *NewFaceFromFace(const face_t *in);
 face_t *MirrorFace(const face_t *face);
diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh
index ab54ec5d..1dcab55d 100644
--- a/include/qbsp/qbsp.hh
+++ b/include/qbsp/qbsp.hh
@@ -370,7 +370,6 @@ struct node_t
     bool opaque() const;
 };
 
-#include <qbsp/csg4.hh>
 #include <qbsp/solidbsp.hh>
 #include <qbsp/merge.hh>
 #include <qbsp/surfaces.hh>
diff --git a/qbsp/brush.cc b/qbsp/brush.cc
index 6a09851e..5ec1a852 100644
--- a/qbsp/brush.cc
+++ b/qbsp/brush.cc
@@ -24,7 +24,7 @@
 #include <list>
 
 #include <qbsp/brush.hh>
-
+#include <qbsp/csg4.hh>
 #include <qbsp/qbsp.hh>
 
 /*
diff --git a/qbsp/csg4.cc b/qbsp/csg4.cc
index b91013aa..34dff3a0 100644
--- a/qbsp/csg4.cc
+++ b/qbsp/csg4.cc
@@ -20,6 +20,8 @@
 */
 // csg4.c
 
+#include <qbsp/csg4.hh>
+
 #include <qbsp/qbsp.hh>
 
 #include <qbsp/brush.hh>
diff --git a/qbsp/merge.cc b/qbsp/merge.cc
index a781a2e6..d3d3d2f2 100644
--- a/qbsp/merge.cc
+++ b/qbsp/merge.cc
@@ -21,6 +21,7 @@
 // merge.c
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/csg4.hh>
 
 #ifdef PARANOID
 static void CheckColinear(face_t *f)
diff --git a/qbsp/solidbsp.cc b/qbsp/solidbsp.cc
index 0fbcec59..fb4ca5af 100644
--- a/qbsp/solidbsp.cc
+++ b/qbsp/solidbsp.cc
@@ -21,6 +21,7 @@
 
 #include <climits>
 
+#include <qbsp/csg4.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/brush.hh>
 
diff --git a/qbsp/surfaces.cc b/qbsp/surfaces.cc
index 890fd280..2631b127 100644
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@@ -20,6 +20,7 @@
 */
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/csg4.hh>
 #include <qbsp/brush.hh>
 
 #include <map>