diff --git a/sc2/src/sc2code/demo.c b/sc2/src/sc2code/demo.c
index ae3e50b0c..8c27aaa54 100644
--- a/sc2/src/sc2code/demo.c
+++ b/sc2/src/sc2code/demo.c
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "starcon.h"
+#include "demo.h"
 #include "declib.h"
 
 #if DEMO_MODE || CREATE_JOURNAL
diff --git a/sc2/src/sc2code/libs/declib.h b/sc2/src/sc2code/libs/declib.h
index bb07d36c0..7b14769c8 100644
--- a/sc2/src/sc2code/libs/declib.h
+++ b/sc2/src/sc2code/libs/declib.h
@@ -19,6 +19,7 @@
 #ifndef _DECLIB_H
 #define _DECLIB_H
 
+#include "libs/compiler.h"
 #define DECODE_REF PVOID
 
 enum
diff --git a/sc2/src/sc2code/starcon.c b/sc2/src/sc2code/starcon.c
index f10b1d465..56415a916 100644
--- a/sc2/src/sc2code/starcon.c
+++ b/sc2/src/sc2code/starcon.c
@@ -17,6 +17,7 @@
  */
 
 #include "starcon.h"
+#include "demo.h"
 #include "credits.h"
 
 //Added by Chris
@@ -256,6 +257,7 @@ black_urquan_genocide (void)
 
 	if (best_dist < 0 && best_dx == 0 && best_dy == 0)
 	{
+		// All spheres of influence are gone - game over.
 		GLOBAL (CurrentActivity) &= ~IN_BATTLE;
 		GLOBAL_SIS (CrewEnlisted) = (COUNT)~0;
 
@@ -263,6 +265,7 @@ black_urquan_genocide (void)
 	}
 	else
 	{
+		// Moving towards new race to cleanse.
 		COUNT speed;
 
 		if (best_dist < 0)
diff --git a/sc2/src/sc2code/starcon.h b/sc2/src/sc2code/starcon.h
index 8f0912153..729acf153 100644
--- a/sc2/src/sc2code/starcon.h
+++ b/sc2/src/sc2code/starcon.h
@@ -35,11 +35,17 @@ extern int ScreenHeight;
 #define SIS_ORG_X (7 + SAFE_X)
 #define SIS_ORG_Y (10 + SAFE_Y)
 #define STATUS_WIDTH 64
+		/* Width of the status "window" (the right part of the screen) */
 #define STATUS_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2))
+		/* Height of the status "window" (the right part of the screen) */
 #define SPACE_WIDTH (SCREEN_WIDTH - STATUS_WIDTH - (SAFE_X * 2))
+		/* Width of the space "window" (the left part of the screen) */
 #define SPACE_HEIGHT (SCREEN_HEIGHT - (SAFE_Y * 2))
+		/* Height of the space "window" (the left part of the screen) */
 #define SIS_SCREEN_WIDTH (SPACE_WIDTH - 14)
+		/* Width of the usable part of the space "window" */
 #define SIS_SCREEN_HEIGHT (SPACE_HEIGHT - 13)
+		/* Height of the usable part of the space "window" */
 
 #include "config.h"
 #include "../port.h"
@@ -66,7 +72,6 @@ extern int ScreenHeight;
 #include "build.h"
 #include "intel.h"
 #include "sounds.h"
-#include "demo.h"
 #include "starbase.h"
 #include "sis.h"
 #include "state.h"