A little sanity in gib's header deps. Not much granted, but it's there.

include/QF/gib.h

@@ -1,3 +1,6 @@
+#ifndef __GIB_H
+#define __GIB_H
+
 typedef int (*gib_func_t) (void);
 
 typedef struct gib_var_s
@@ -36,3 +39,4 @@ void GIB_Gib_f (void);
 void GIB_Load_f (void);
 void GIB_Stats_f (void);
 
+#endif // __GIB_H

include/gib_instructions.h

@@ -1,3 +1,5 @@
+#include "QF/gib.h"
+
 void GIB_AddInstruction (char *name, gib_func_t func);
 gib_inst_t *GIB_Find_Instruction (char *name);
 void GIB_Init_Instructions (void);

include/gib_interpret.h

@@ -1,3 +1,5 @@
+#include "QF/gib.h"
+
 #define GIB_MAXCALLS 2048
 #define GIB_MAXSUBARGS 256
 

include/gib_modules.h

@@ -1,3 +1,6 @@
+#include "QF/gib.h"
+#include "QF/quakeio.h"
+
 void GIB_Module_Load (char *name, QFile *f);
 gib_module_t *GIB_Create_Module (char *name);
 gib_sub_t *GIB_Create_Sub (gib_module_t *mod, char *name);

include/gib_parse.h

@@ -1,3 +1,5 @@
+#include "QF/gib.h"
+
 int GIB_Get_Inst (char *start);
 int GIB_Get_Arg (char *start);
 int GIB_End_Quote (char *start);

include/gib_stack.h

@@ -1,3 +1,5 @@
+#include "QF/gib.h"
+
 #define GIB_LOCALS gib_substack[gib_subsp - 1].local
 #define GIB_CURRENTMOD gib_substack[gib_subsp - 1].mod
 #define GIB_CURRENTSUB gib_substack[gib_subsp - 1].sub

include/gib_vars.h

@@ -1,3 +1,4 @@
+#include "QF/gib.h"
 
 gib_var_t *GIB_Var_FindLocal (char *key);
 gib_var_t *GIB_Var_FindGlobal (char *key);

libs/gib/gib.c

@@ -1,27 +1,17 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 
-#include <ctype.h>
+
-#include "QF/cvar.h"
-#include "QF/compat.h"
-#include "QF/console.h"
-#include "QF/qargs.h"
 #include "QF/cmd.h"
-#include "QF/zone.h"
+#include "QF/console.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
+#include "QF/quakefs.h"
+
 #include "gib_instructions.h"
 #include "gib_interpret.h"
 #include "gib_modules.h"
 #include "gib_parse.h"
-#include "gib_vars.h"
 
 
 // Standard cvars

libs/gib/gib_instructions.c

@@ -7,23 +7,18 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
-#include <ctype.h>
 #include <stdlib.h>
-#include "QF/cvar.h"
+#include <ctype.h>
+
 #include "QF/console.h"
-#include "QF/qargs.h"
 #include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
+
+#include "gib_error.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"
-#include "gib_modules.h"
 #include "gib_parse.h"
 #include "gib_vars.h"
-#include "gib_error.h"
-#include "gib_stack.h"
 
 static gib_inst_t *gibinstructions;
 

libs/gib/gib_interpret.c

@@ -7,24 +7,18 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
+#include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
-#include "QF/cvar.h"
+#include <ctype.h>
-#include "QF/compat.h"
+
-#include "QF/console.h"
-#include "QF/qargs.h"
-#include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
+
+#include "gib_error.h"
 #include "gib_instructions.h"
 #include "gib_interpret.h"
-#include "gib_modules.h"
 #include "gib_parse.h"
-#include "gib_vars.h"
-#include "gib_error.h"
 #include "gib_stack.h"
+#include "gib_vars.h"
 
 char       *gib_subargv[256];
 int         gib_subargc;

libs/gib/gib_modules.c

@@ -7,22 +7,13 @@
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-
 #include <ctype.h>
-#include <stdlib.h>
 
-#include "QF/cvar.h"
 #include "QF/console.h"
-#include "QF/qargs.h"
-#include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
-#include "gib_instructions.h"
+#include "QF/quakeio.h"
-#include "gib_interpret.h"
+
 #include "gib_modules.h"
-#include "gib_parse.h"
-#include "gib_vars.h"
 
 static gib_module_t *gibmodules;
 

libs/gib/gib_parse.c

@@ -8,20 +8,11 @@
 # include <strings.h>
 #endif
 
-#include <ctype.h>
-#include "QF/cvar.h"
-#include "QF/console.h"
-#include "QF/qargs.h"
-#include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
-#include "gib_instructions.h"
+
-#include "gib_interpret.h"
+#include "gib_error.h"
 #include "gib_modules.h"
 #include "gib_parse.h"
-#include "gib_vars.h"
-#include "gib_error.h"
 
 int
 GIB_Get_Inst (char *start)

libs/gib/gib_stack.c

@@ -1,28 +1,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#include <ctype.h>
 #include <stdlib.h>
-#include "QF/cvar.h"
+
-#include "QF/console.h"
-#include "QF/qargs.h"
-#include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
-#include "gib_instructions.h"
+
-#include "gib_interpret.h"
-#include "gib_modules.h"
-#include "gib_parse.h"
-#include "gib_vars.h"
-#include "gib_error.h"
 #include "gib_stack.h"
 
 gib_instack_t *gib_instack = 0;

libs/gib/gib_vars.c

@@ -1,27 +1,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
-#include <ctype.h>
 #include <stdlib.h>
-#include "QF/cvar.h"
+
-#include "QF/console.h"
-#include "QF/qargs.h"
-#include "QF/cmd.h"
-#include "QF/zone.h"
-#include "QF/quakefs.h"
 #include "QF/gib.h"
-#include "gib_instructions.h"
+
-#include "gib_interpret.h"
-#include "gib_modules.h"
-#include "gib_parse.h"
-#include "gib_vars.h"
 #include "gib_stack.h"
 
 gib_var_t  *