diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh
index 8f46c3a4..ec8e51e5 100644
--- a/include/qbsp/map.hh
+++ b/include/qbsp/map.hh
@@ -193,4 +193,6 @@ void ExportObj_Faces(const std::vector<const face_t *> &faces);
 void ExportObj_Brushes(const std::vector<const brush_t *> &brushes);
 void ExportObj_Surfaces(const surface_t *surfaces);
 
+void WriteBspBrushMap(const char *name, const std::vector<const brush_t *> &list);
+
 #endif
diff --git a/qbsp/map.cc b/qbsp/map.cc
index 6f243eca..22711930 100644
--- a/qbsp/map.cc
+++ b/qbsp/map.cc
@@ -2098,8 +2098,8 @@ WriteBspBrushMap
 from q3map
 ==================
 */
-static void
-WriteBspBrushMap(const char *name, const std::vector<brush_t *> &list)
+void
+WriteBspBrushMap(const char *name, const std::vector<const brush_t *> &list)
 {
     FILE	*f;
     
@@ -2110,10 +2110,10 @@ WriteBspBrushMap(const char *name, const std::vector<brush_t *> &list)
     
     fprintf (f, "{\n\"classname\" \"worldspawn\"\n");
     
-    for (brush_t *brush : list)
+    for (const brush_t *brush : list)
     {
         fprintf (f, "{\n");
-        for (face_t *face = brush->faces; face; face = face->next)
+        for (const face_t *face = brush->faces; face; face = face->next)
         {
             // FIXME: Factor out this mess
             qbsp_plane_t plane = map.planes.at(face->planenum);
@@ -2152,7 +2152,7 @@ from q3map
 static void
 TestExpandBrushes(const mapentity_t *src)
 {
-    std::vector<brush_t *> hull1brushes;
+    std::vector<const brush_t *> hull1brushes;
     
     for (int i = 0; i < src->nummapbrushes; i++) {
         const mapbrush_t *mapbrush = &src->mapbrush(i);