diff --git a/source_files/obsidian_main/g_doom.cc b/source_files/obsidian_main/g_doom.cc
index ed17cd6f1..704296bf3 100644
--- a/source_files/obsidian_main/g_doom.cc
+++ b/source_files/obsidian_main/g_doom.cc
@@ -100,9 +100,7 @@ enum map_format_e {
 map_format_e map_format;
 static bool UDMF_mode;
 
-typedef std::vector<qLump_c *> lump_bag_t;
-
-static lump_bag_t *sections[NUM_SECTIONS];
+static std::vector<qLump_c *> *sections[NUM_SECTIONS];
 
 static const char *section_markers[NUM_SECTIONS][2] = {
     {"PP_START", "PP_END"},
@@ -422,7 +420,7 @@ static void WriteBehavior() {
 static void ClearSections() {
     for (int k = 0; k < NUM_SECTIONS; k++) {
         if (!sections[k]) {
-            sections[k] = new lump_bag_t;
+            sections[k] = new std::vector<qLump_c *>;
         }
 
         for (unsigned int n = 0; n < sections[k]->size(); n++) {
diff --git a/source_files/obsidian_main/main.h b/source_files/obsidian_main/main.h
index 14aa9312d..4a9eff650 100644
--- a/source_files/obsidian_main/main.h
+++ b/source_files/obsidian_main/main.h
@@ -31,9 +31,10 @@
 #ifndef CONSOLE_ONLY
 #include "hdr_fltk.h"
 #include "ui_window.h"
+#endif
 #include "lib_util.h"
 #include "sys_debug.h"
-#endif
+
 extern std::string OBSIDIAN_TITLE;
 
 #ifdef OBSIDIAN_TIMESTAMP