diff --git a/dbwind/dbwind.h b/dbwind/dbwind.h
index 388c5ca4..7f5ce09d 100644
--- a/dbwind/dbwind.h
+++ b/dbwind/dbwind.h
@@ -243,6 +243,7 @@ extern void DBWHLRedrawPrepWindow();
 extern void CmdInit();
 extern void DBWinit();
 extern int  DBWTechParseStyle();
+extern void dbwButtonSetCursor();
 
 /* Random procedures used internally to this module.  None of these
  * should ever need to be called by the outside world.
diff --git a/extflat/EFantenna.c b/extflat/EFantenna.c
index 532042b1..50cf849d 100644
--- a/extflat/EFantenna.c
+++ b/extflat/EFantenna.c
@@ -37,6 +37,9 @@
 #include "select/select.h"
 #include "utils/malloc.h"
 
+/* C99 compat */
+#include "extract/extract.h"
+
 /* Forward declarations */
 int antennacheckArgs();
 int antennacheckVisit();
diff --git a/extflat/EFargs.c b/extflat/EFargs.c
index b325ed5f..970b07dc 100644
--- a/extflat/EFargs.c
+++ b/extflat/EFargs.c
@@ -38,6 +38,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 
 /* C99 compat */
 #include "textio/textio.h"
+#include "utils/pathvisit.h"
 
 #define        atoCap(s)       ((EFCapValue)atof(s))
 
diff --git a/extract/extract.h b/extract/extract.h
index 7c918585..74c16e99 100644
--- a/extract/extract.h
+++ b/extract/extract.h
@@ -94,7 +94,6 @@ extern int ExtGetGateTypesMask();
 extern int ExtGetDiffTypesMask();
 
 #ifdef MAGIC_WRAPPER
-extern bool ExtGetDevInfo();
 extern bool ExtCompareStyle();
 #endif
 
@@ -143,5 +142,6 @@ extern void extSubtree();
 extern int  extUniqueCell();
 extern void ExtLabelOneRegion();
 extern void ExtInit();
+extern bool ExtGetDevInfo();
 
 #endif /* _EXTRACT_H */
diff --git a/graphics/grOGL1.c b/graphics/grOGL1.c
index a8eeef47..ab505b9f 100644
--- a/graphics/grOGL1.c
+++ b/graphics/grOGL1.c
@@ -30,6 +30,11 @@
 #include "grOGLInt.h"
 #include "utils/paths.h"
 
+/* C99 compat */
+#include "dbwind/dbwind.h"
+#include "utils/main.h"
+#include "utils/malloc.h"
+
 GLubyte 	**grOGLStipples;
 HashTable	grOGLWindowTable;
 Display 	*grXdpy;
diff --git a/graphics/grOGL3.c b/graphics/grOGL3.c
index acd4366d..5497862f 100644
--- a/graphics/grOGL3.c
+++ b/graphics/grOGL3.c
@@ -38,6 +38,9 @@
 #include "database/fonts.h"
 #include "grOGLInt.h"
 
+/* C99 compat */
+#include "utils/malloc.h"
+
 extern Display *grXdpy;
 
 static XFontStruct *grXFonts[4];
diff --git a/graphics/grX11su1.c b/graphics/grX11su1.c
index 8e888329..e4485698 100644
--- a/graphics/grX11su1.c
+++ b/graphics/grX11su1.c
@@ -45,6 +45,11 @@
 #include "grX11Int.h"
 #include "utils/paths.h"
 
+/* C99 compat */
+#include "utils/main.h"
+#include "utils/malloc.h"
+#include "dbwind/dbwind.h"
+
 extern char  *DBWStyleType;
 
 Display      *grXdpy;
diff --git a/graphics/grX11su2.c b/graphics/grX11su2.c
index 33f10873..c30ef53f 100644
--- a/graphics/grX11su2.c
+++ b/graphics/grX11su2.c
@@ -33,6 +33,9 @@
 #include "graphics/graphicsInt.h"
 #include "grX11Int.h"
 
+/* C99 compat */
+#include "utils/main.h"
+
 extern char *DBWStyleType;
 extern unsigned long grPlanes[256];
 extern unsigned long grPixels[256];
diff --git a/graphics/grX11su3.c b/graphics/grX11su3.c
index 4a1da69e..7416bdd9 100644
--- a/graphics/grX11su3.c
+++ b/graphics/grX11su3.c
@@ -23,6 +23,9 @@
 #include <math.h>
 #include <X11/Xlib.h>
 
+/* C99 compat */
+#include <X11/Xutil.h>
+
 #include "utils/magic.h"
 #include "utils/geometry.h"
 #include "graphics/graphics.h"
@@ -36,6 +39,9 @@
 #include "database/fonts.h"
 #include "grX11Int.h"
 
+/* C99 compat */
+#include "utils/malloc.h"
+
 /* locals */
 
 static XFontStruct *grXFonts[4];
diff --git a/graphics/grX11thread.c b/graphics/grX11thread.c
index cb98ba22..7a0cb27b 100644
--- a/graphics/grX11thread.c
+++ b/graphics/grX11thread.c
@@ -15,6 +15,10 @@
 #include <X11/keysym.h>
 #include <pthread.h>
 
+/* C99 compat */
+#include <stdlib.h>
+#include <unistd.h>
+
 #include "utils/magic.h"
 #include "utils/geometry.h"
 #include "graphics/graphics.h"
diff --git a/graphics/graphicsInt.h b/graphics/graphicsInt.h
index 85fc191a..8b7f55a3 100644
--- a/graphics/graphicsInt.h
+++ b/graphics/graphicsInt.h
@@ -93,5 +93,11 @@ extern void grInformDriver();
 extern bool GrReadGlyphs();
 extern bool GrBoxOutline();
 extern bool grtcairoLoadFont();
+extern int  xloop_create();
+extern bool groglLoadFont();
+extern void GrX11Close();
+extern bool grx11LoadFont();
+extern void xloop_end();
+extern bool groglPreLoadFont();
 
 #endif /* _GRAPHICSINT_H */
diff --git a/sim/SimRsim.c b/sim/SimRsim.c
index 772b1e76..67b563d0 100644
--- a/sim/SimRsim.c
+++ b/sim/SimRsim.c
@@ -27,6 +27,7 @@
 #include <ctype.h>
 #include <signal.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -45,7 +46,9 @@
 #include "windows/windows.h"
 #include "dbwind/dbwind.h"
 #include "sim/sim.h"
-#include <errno.h>
+
+/* C99 compat */
+#include "textio/textio.h"
 
 static bool InitRsim();
 
diff --git a/sim/sim.h b/sim/sim.h
index c2390997..36fa4169 100644
--- a/sim/sim.h
+++ b/sim/sim.h
@@ -37,5 +37,10 @@ extern int  SimSrConnect();
 extern void SimTreeCopyConnect();
 extern int  SimTreeSrNMTiles();
 extern int  SimTreeSrTiles();
+extern bool SimStartRsim();
+extern void SimConnectRsim();
+extern bool SimSelection();
+extern void SimRsimMouse();
+extern int  SimFillBuffer();
 
 #endif /* _SIM_H */
diff --git a/textio/textioInt.h b/textio/textioInt.h
index 3177355e..b9c9598b 100644
--- a/textio/textioInt.h
+++ b/textio/textioInt.h
@@ -55,13 +55,12 @@ extern bool TxGetInputEvent();
 extern void txFprintfBasic(FILE *, ...);
 
 /* C99 compat */
-int  Tcl_printf();
 void txCommandsInit();
-int  Tcl_printf();
-int  Tcl_printf();
-int  Tcl_printf();
-int  Tcl_printf();
 int  TranslateChar();
 char *TxGetLineWPrompt();
 
+#ifdef MAGIC_WRAPPER
+int  Tcl_printf();
+#endif
+
 #endif /* _TEXTIOINT_H */
diff --git a/textio/txCommands.c b/textio/txCommands.c
index a213fd9d..0a43c0df 100644
--- a/textio/txCommands.c
+++ b/textio/txCommands.c
@@ -52,6 +52,7 @@ static char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic-8.0/t
 
 /* C99 compat */
 #include "windows/windows.h"
+#include "utils/main.h"
 
 /* Turning this flag on prints out input events and commands as they
  * are processed.
diff --git a/textio/txInput.c b/textio/txInput.c
index 6f23c685..36234ade 100644
--- a/textio/txInput.c
+++ b/textio/txInput.c
@@ -49,6 +49,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 #include "cif/CIFint.h"
 #include "cif/CIFread.h"
 
+/* C99 compat */
+#include "utils/malloc.h"
+
 #ifdef USE_READLINE
 #ifdef HAVE_READLINE
 #include <readline/readline.h>
diff --git a/textio/txMain.c b/textio/txMain.c
index 17c9ed52..c52d9cdb 100644
--- a/textio/txMain.c
+++ b/textio/txMain.c
@@ -37,6 +37,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
 #include "database/database.h"
 #include "dbwind/dbwind.h"
 
+/* C99 compat */
+#include "utils/malloc.h"
+
 /* Global variables that indicate if we are reading or writing to a tty.
  */
 global bool TxStdinIsatty;
diff --git a/utils/pathvisit.h b/utils/pathvisit.h
index f05755a3..beb84b71 100644
--- a/utils/pathvisit.h
+++ b/utils/pathvisit.h
@@ -41,4 +41,9 @@ typedef struct
 
 PaVisit *PaVisitInit();
 
+/* C99 compat */
+extern void PaVisitAddClient();
+extern int  PaVisitFiles();
+extern void PaVisitFree();
+
 #endif	/* _PATHVISIT_H */
diff --git a/utils/utils.h b/utils/utils.h
index 0e6d7738..1455f57f 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -74,6 +74,7 @@ extern int  PaEnum();
 extern int  paVisitProcess();
 extern void SetNoisyInt();
 extern void SetNoisyDI();
+extern bool ParsSplit();
 
 #ifdef HAVE_ZLIB
 extern gzFile PaZOpen(char *, char *, char *, char *, char *, char **);