diff --git a/include/error.h b/include/error.h
index b3ee671ae..31e86c276 100644
--- a/include/error.h
+++ b/include/error.h
@@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 /*
  * $Source: /cvs/cvsroot/d2x/include/error.h,v $
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
  * $Author: bradleyb $
- * $Date: 2001-01-19 03:30:16 $
+ * $Date: 2001-01-22 15:49:14 $
  *
  * Header for error handling/printing/exiting code
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1.1.1  2001/01/19 03:30:16  bradleyb
+ * Import of d2x-0.0.8
+ *
  * Revision 1.3  1999/10/14 04:48:21  donut
  * alpha fixes, and gl_font args
  *
@@ -69,6 +72,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  *
  */
 
+#ifndef _ERROR_H
+#define _ERROR_H
+
+#include <stdio.h>
+
 #ifdef __GNUC__
 #define __noreturn __attribute__ ((noreturn))
 #define __format __attribute__ ((format (printf, 1, 2)))
@@ -144,3 +152,5 @@ void Int3(void);								      //generate int3
 #define Int3() ((void)0)
 //void Int3();
 #endif
+
+#endif /* _ERROR_H */
diff --git a/include/mono.h b/include/mono.h
index 33d12d962..c899c14db 100644
--- a/include/mono.h
+++ b/include/mono.h
@@ -14,6 +14,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _MONO_H
 #define _MONO_H
 
+#include <stdio.h>
 #include <stdarg.h>
 #include "console.h"
 
diff --git a/main/game.c b/main/game.c
index 31c7d8552..2e732cc4f 100644
--- a/main/game.c
+++ b/main/game.c
@@ -12,7 +12,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-char game_rcsid[] = "$Id: game.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $";
+char game_rcsid[] = "$Id: game.c,v 1.3 2001-01-22 15:49:14 bradleyb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -108,6 +108,10 @@ char game_rcsid[] = "$Id: game.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $";
 #include "playsave.h"
 #include "fix.h"
 
+#ifdef OGL
+#include "ogl_init.h"
+#endif
+
 int VGA_current_mode;
 
 #ifdef MWPROFILER
diff --git a/main/gamerend.c b/main/gamerend.c
index f9e287181..9983a1ea6 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 
 #ifdef RCS
-static char rcsid[] = "$Id: gamerend.c,v 1.2 2001-01-20 13:49:15 bradleyb Exp $";
+static char rcsid[] = "$Id: gamerend.c,v 1.3 2001-01-22 15:49:15 bradleyb Exp $";
 #endif
 
 
@@ -63,6 +63,10 @@ static char rcsid[] = "$Id: gamerend.c,v 1.2 2001-01-20 13:49:15 bradleyb Exp $"
 #include "poly_acc.h"
 #endif
 
+#ifdef OGL
+#include "ogl_init.h"
+#endif
+
 extern fix Cruise_speed;
 extern int LinearSVGABuffer;
 extern int Current_display_mode;
diff --git a/video/ogl.c b/video/ogl.c
index 31e2dab6c..f034f9395 100644
--- a/video/ogl.c
+++ b/video/ogl.c
@@ -28,7 +28,7 @@
 #include "powerup.h"
 #include "polyobj.h"
 #include "gamefont.h"
-
+#include "grdef.h"
 
 #ifndef M_PI
 #define M_PI 3.14159