qbsp.hh: remove brush.hh include

include/qbsp/brush.hh

@@ -22,6 +22,7 @@
 #pragma once
 
 #include <qbsp/winding.hh>
+#include <qbsp/qbsp.hh>
 #include <common/aabb.hh>
 #include <optional>
 

include/qbsp/map.hh

@@ -21,6 +21,8 @@
 
 #pragma once
 
+#include <qbsp/brush.hh>
+
 #include <common/parser.hh>
 #include "common/cmdlib.hh"
 

include/qbsp/qbsp.hh

@@ -40,6 +40,8 @@
 #include <cstring>
 #include <ctime>
 
+#include <qbsp/winding.hh>
+
 #include <common/bspfile.hh>
 #include <common/aabb.hh>
 #include <common/settings.hh>
@@ -236,9 +238,6 @@ extern settings::qbsp_settings options;
  */
 #define MAX_BSP_CLIPNODES 0xfff0
 
-// Various other geometry maximums
-constexpr size_t MAXEDGES = 64;
-
 // 0-2 are axial planes
 // 3-5 are non-axial planes snapped to the nearest
 #define PLANE_X 0
@@ -371,7 +370,6 @@ struct node_t
     bool opaque() const;
 };
 
-#include <qbsp/brush.hh>
 #include <qbsp/csg4.hh>
 #include <qbsp/solidbsp.hh>
 #include <qbsp/merge.hh>

include/qbsp/winding.hh

@@ -23,6 +23,8 @@
 
 #include "common/polylib.hh"
 
+constexpr size_t MAXEDGES = 64;
+
 using winding_t = polylib::winding_base_t<MAXEDGES>;
 
-winding_t BaseWindingForPlane(const qplane3d &p);
+winding_t BaseWindingForPlane(const qplane3d &p);

qbsp/brush.cc

@@ -23,6 +23,8 @@
 #include <cstring>
 #include <list>
 
+#include <qbsp/brush.hh>
+
 #include <qbsp/qbsp.hh>
 
 /*

qbsp/csg4.cc

@@ -22,6 +22,8 @@
 
 #include <qbsp/qbsp.hh>
 
+#include <qbsp/brush.hh>
+
 #include <atomic>
 #include <mutex>
 

qbsp/exportobj.cc

@@ -19,6 +19,7 @@
 */
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 #include <qbsp/wad.hh>
 
 #include <unordered_set>

qbsp/map.cc

@@ -33,6 +33,7 @@
 #include <fmt/ostream.h>
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 #include <common/parser.hh>
 #include <common/fs.hh>
 #include <common/imglib.hh>

qbsp/qbsp.cc

@@ -28,6 +28,7 @@
 #include <common/fs.hh>
 #include <common/threads.hh>
 #include <common/settings.hh>
+#include <qbsp/brush.hh>
 #include <qbsp/qbsp.hh>
 #include <qbsp/wad.hh>
 #include <fmt/chrono.h>

qbsp/solidbsp.cc

@@ -22,6 +22,7 @@
 #include <climits>
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
 
 #include <list>
 #include <atomic>

qbsp/surfaces.cc

@@ -20,6 +20,8 @@
 */
 
 #include <qbsp/qbsp.hh>
+#include <qbsp/brush.hh>
+
 #include <map>
 #include <list>