diff --git a/src/kernel/building.h b/src/kernel/building.h
index 082cdb99f..766242c4a 100644
--- a/src/kernel/building.h
+++ b/src/kernel/building.h
@@ -26,6 +26,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern "C" {
 #endif
 
+    struct gamedata;
+    
     /* maintenance::flags */
 #define MTF_NONE     0x00
 #define MTF_VARIABLE 0x01       /* resource usage scales with size */
diff --git a/src/kernel/faction.h b/src/kernel/faction.h
index 8038cf640..c7578cc47 100644
--- a/src/kernel/faction.h
+++ b/src/kernel/faction.h
@@ -30,7 +30,8 @@ extern "C" {
     struct item;
     struct seen_region;
     struct attrib_type;
-
+    struct gamedata;
+    
     extern struct attrib_type at_maxmagicians;
     /* SMART_INTERVALS: define to speed up finding the interval of regions that a
        faction is in. defining this speeds up the turn by 30-40% */
diff --git a/src/kernel/region.h b/src/kernel/region.h
index 7d250874e..411fa5580 100644
--- a/src/kernel/region.h
+++ b/src/kernel/region.h
@@ -18,9 +18,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifndef H_KRNL_REGION
 #define H_KRNL_REGION
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <stddef.h>
 #include "types.h"
@@ -67,6 +64,7 @@ extern "C" {
     struct rawmaterial;
     struct item;
     struct faction;
+    struct gamedata;
 
 #define MORALE_TAX_FACTOR 0.005 /* 0.5% tax per point of morale */
 #define MORALE_MAX 10           /* Maximum morale allowed */
@@ -76,6 +74,11 @@ extern "C" {
 #define MORALE_AVERAGE 6        /* default average time for morale to change */
 #define MORALE_TRANSFER 2       /* points of morale lost when GIVE COMMAND */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
     typedef struct region_owner {
         struct faction *owner;
         struct faction *last_owner;
diff --git a/src/kernel/unit.h b/src/kernel/unit.h
index ca2d52310..36abb1cf3 100644
--- a/src/kernel/unit.h
+++ b/src/kernel/unit.h
@@ -30,7 +30,7 @@ extern "C" {
     struct skill;
     struct item;
     struct sc_mage;
-
+    struct gamedata;
 #define UFL_DEAD          (1<<0)
 #define UFL_ISNEW         (1<<1)        /* 2 */
 #define UFL_LONGACTION    (1<<2)        /* 4 */
diff --git a/src/util/resolve.h b/src/util/resolve.h
index c9292a356..076b20508 100644
--- a/src/util/resolve.h
+++ b/src/util/resolve.h
@@ -21,6 +21,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "variant.h"
 struct storage;
+struct gamedata;
 
 #ifdef __cplusplus
 extern "C" {