From fb5ae4e0bc74f3127f63dd8177dfbca89bd1989b Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Wed, 9 Sep 2015 03:27:52 +0000
Subject: [PATCH] Fix various header freestanding issues

---
 common/include/internal.h  | 6 ++----
 common/include/valptridx.h | 1 +
 common/main/automap.h      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/include/internal.h b/common/include/internal.h
index 4f54ac2f3..0714d85d4 100644
--- a/common/include/internal.h
+++ b/common/include/internal.h
@@ -6,10 +6,10 @@
  */
 /* prototypes for function calls between files within the OpenGL module */
 
-#ifndef _INTERNAL_H_
-#define _INTERNAL_H_
+#pragma once
 
 #include "ogl_init.h" // interface to OpenGL module
+#include "gr.h"
 
 #ifdef __cplusplus
 
@@ -68,5 +68,3 @@ extern void ogl_swap_buffers_internal(void);
 //inline GLfloat PAL2Tb(int c);
 
 #endif
-
-#endif // _INTERNAL_H_
diff --git a/common/include/valptridx.h b/common/include/valptridx.h
index 93f046800..f2b3044e5 100644
--- a/common/include/valptridx.h
+++ b/common/include/valptridx.h
@@ -9,6 +9,7 @@
 #include <stdexcept>
 #include <string>
 #include "fwdvalptridx.h"
+#include "compiler-array.h"
 #include "compiler-static_assert.h"
 #include "compiler-type_traits.h"
 #include "pack.h"
diff --git a/common/main/automap.h b/common/main/automap.h
index c5defbd63..b1a910097 100644
--- a/common/main/automap.h
+++ b/common/main/automap.h
@@ -40,7 +40,7 @@ extern void automap_clear_visited();
 extern array<ubyte, MAX_SEGMENTS> Automap_visited;
 
 #if defined(DXX_BUILD_DESCENT_II)
-#include "objnum.h"
+#include "fwdobject.h"
 #include "ntstring.h"
 #include "window.h"