Rationalise header file handling

ehird · ehird · commit f12c9ccd1bbc · 2011-12-21T14:01:18.000Z
diff --git a/block.h b/block.h
@@ -1,8 +1,6 @@
 #ifndef MCMAP_BLOCK_H
 #define MCMAP_BLOCK_H 1
 
-#include "types.h"
-
 extern struct block_info
 {
 	char *name;
diff --git a/cmd.c b/cmd.c
@@ -6,18 +6,21 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
 
 #include <SDL.h>
 
-#include "cmd.h"
-#include "protocol.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
-#include "map.h"
-#include "world.h"
+#include "protocol.h"
 #include "proxy.h"
+#include "world.h"
+#include "cmd.h"
 
 struct command
 {
diff --git a/cmd.h b/cmd.h
@@ -1,9 +1,6 @@
 #ifndef MCMAP_CMD_H
 #define MCMAP_CMD_H 1
 
-#include "config.h"
-#include "types.h"
-
 void init_cmd(void);
 
 void cmd_parse(struct buffer cmd);
diff --git a/common.c b/common.c
@@ -1,13 +1,14 @@
 #include <unistd.h>
 #include <math.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <SDL.h>
 
-#include "protocol.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
-#include "map.h"
-#include "world.h"
+#include "protocol.h"
 #include "proxy.h"
 
 guint coord_hash(gconstpointer key)
diff --git a/common.h b/common.h
@@ -1,9 +1,6 @@
 #ifndef MCMAP_COMMON_H
 #define MCMAP_COMMON_H
 
-#include "platform.h"
-#include "types.h"
-
 #define NELEMS(array) (sizeof(array) / sizeof((array)[0]))
 
 /* options */
diff --git a/console.c b/console.c
@@ -2,13 +2,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include <glib.h>
 
-#include "protocol.h"
-#include "common.h"
+#include "types.h"
 #include "console.h"
-#include "world.h"
 
 int console_outfd = 1;
 
diff --git a/main.c b/main.c
@@ -3,21 +3,24 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <SDL.h>
 #include <SDL_ttf.h>
 
-#include "cmd.h"
 #include "config.h"
-#include "protocol.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
-#include "console.h"
-#include "map.h"
 #include "block.h"
-#include "world.h"
+#include "cmd.h"
+#include "console.h"
+#include "protocol.h"
 #include "proxy.h"
 #include "ui.h"
+#include "world.h"
+#include "map.h"
 
 /* default command-line options */
 
diff --git a/map.c b/map.c
@@ -1,18 +1,19 @@
 #include <math.h>
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <SDL.h>
 #include <SDL_ttf.h>
 
-#include "protocol.h"
-#include "common.h"
-#include "console.h"
 #include "config.h"
-#include "map.h"
+#include "types.h"
+#include "platform.h"
 #include "block.h"
-#include "world.h"
+#include "protocol.h"
 #include "proxy.h"
+#include "world.h"
+#include "map.h"
 
 /* color maps */
 
diff --git a/map.h b/map.h
@@ -1,10 +1,6 @@
 #ifndef MCMAP_MAP_H
 #define MCMAP_MAP_H 1
 
-#include <SDL_ttf.h>
-#include "world.h"
-#include "types.h"
-
 #define MCMAP_EVENT_REPAINT SDL_USEREVENT
 
 struct map_region
diff --git a/map_cross.c b/map_cross.c
@@ -1,8 +1,14 @@
+#include <stdbool.h>
+
 #include <glib.h>
 #include <SDL.h>
+#include <SDL_ttf.h>
 
-#include "common.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "protocol.h"
+#include "world.h"
 #include "map.h"
 
 struct state
diff --git a/map_flat.c b/map_flat.c
@@ -1,9 +1,14 @@
+#include <stdbool.h>
+
 #include <glib.h>
 #include <SDL.h>
+#include <SDL_ttf.h>
 
-#include "common.h"
+#include "types.h"
+#include "platform.h"
 #include "console.h"
 #include "protocol.h"
+#include "world.h"
 #include "map.h"
 
 struct state
diff --git a/map_surface.c b/map_surface.c
@@ -1,9 +1,15 @@
+#include <stdbool.h>
+
 #include <glib.h>
 #include <SDL.h>
+#include <SDL_ttf.h>
 
-#include "common.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "block.h"
 #include "protocol.h"
+#include "world.h"
 #include "map.h"
 
 struct state
diff --git a/map_topo.c b/map_topo.c
@@ -1,9 +1,15 @@
+#include <stdbool.h>
+
 #include <glib.h>
 #include <SDL.h>
+#include <SDL_ttf.h>
 
-#include "common.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "block.h"
 #include "protocol.h"
+#include "world.h"
 #include "map.h"
 
 static char *describe(void *data, GPtrArray *attribs)
diff --git a/nbt.c b/nbt.c
@@ -1,10 +1,12 @@
 #include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <zlib.h>
 
-#include "protocol.h"
-#include "common.h"
+#include "config.h"
+#include "types.h"
 #include "console.h"
 #include "nbt.h"
 
diff --git a/nbt.h b/nbt.h
@@ -1,8 +1,6 @@
 #ifndef MCMAP_NBT_H
 #define MCMAP_NBT_H 1
 
-#include "types.h"
-
 enum nbt_tag_type
 {
 	NBT_TAG_END = 0,
diff --git a/posix.c b/posix.c
@@ -4,14 +4,17 @@
 #include <stdio.h>
 #include <sys/mman.h>
 #include <unistd.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "protocol.h"
-#include "common.h"
+#include "types.h"
+#include "platform.h"
 #include "console.h"
+#include "protocol.h"
 #include "proxy.h"
 
 static int console_readline = 0;
diff --git a/protocol.c b/protocol.c
@@ -4,12 +4,16 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #include <glib.h>
 
-#include "protocol.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
 #include "console.h"
+#include "protocol.h"
 
 /*
  * reference:
diff --git a/protocol.h b/protocol.h
@@ -1,9 +1,6 @@
 #ifndef MCMAP_PROTOCOL_H
 #define MCMAP_PROTOCOL_H 1
 
-#include "platform.h"
-#include "types.h"
-
 enum packet_id {
 #define PACKET(id, cname, nfields, ...) \
 	PACKET_##cname = id,
diff --git a/proxy.c b/proxy.c
@@ -4,18 +4,18 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <SDL.h>
 
-#include "cmd.h"
-#include "config.h"
-#include "protocol.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
 #include "console.h"
-#include "map.h"
-#include "world.h"
 #include "ui.h"
+#include "protocol.h"
+#include "world.h"
 #include "proxy.h"
 
 /* proxying thread function to pass packets */
diff --git a/types.h b/types.h
@@ -1,9 +1,6 @@
 #ifndef MCMAP_TYPES_H
 #define MCMAP_TYPES_H 1
 
-#include <stdint.h>
-#include <stdbool.h>
-
 /* Java types used by the protocol */
 typedef int8_t jbyte;
 typedef uint8_t jubyte;
diff --git a/ui.c b/ui.c
@@ -3,19 +3,20 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <stdbool.h>
 
 #include <glib.h>
 #include <SDL.h>
 #include <SDL_ttf.h>
 
-#include "cmd.h"
 #include "config.h"
-#include "protocol.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
 #include "console.h"
-#include "map.h"
+#include "protocol.h"
 #include "world.h"
-#include "proxy.h"
+#include "map.h"
 #include "ui.h"
 
 /* miscellaneous helper routines */
diff --git a/win32.c b/win32.c
@@ -2,9 +2,12 @@
 #include <windows.h>
 #include <glib.h>
 
+/* TODO FIXME: Update includes */
+#if 0
 #include "common.h"
 #include "platform.h"
 #include "win32-res.h"
+#endif
 
 static int splash_argc = 0;
 static char **splash_argv = 0;
diff --git a/world.c b/world.c
@@ -7,20 +7,24 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <stdbool.h>
 
-#include <SDL.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <SDL.h>
+#include <SDL_ttf.h>
 #include <zlib.h>
 
-#include "cmd.h"
-#include "protocol.h"
+#include "config.h"
+#include "types.h"
+#include "platform.h"
 #include "common.h"
+#include "cmd.h"
 #include "console.h"
-#include "map.h"
 #include "nbt.h"
+#include "protocol.h"
 #include "world.h"
-#include "proxy.h"
+#include "map.h"
 
 static GHashTable *region_table = 0;
 
diff --git a/world.h b/world.h

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`#ifndef MCMAP_BLOCK_H`
`2`	`2`	`#define MCMAP_BLOCK_H 1`
`3`	`3`
`4`		`-#include "types.h"`
`5`		`-`
`6`	`4`	`extern struct block_info`
`7`	`5`	`{`
`8`	`6`	`char *name;`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`#ifndef MCMAP_NBT_H`
`2`	`2`	`#define MCMAP_NBT_H 1`
`3`	`3`
`4`		`-#include "types.h"`
`5`		`-`
`6`	`4`	`enum nbt_tag_type`
`7`	`5`	`{`
`8`	`6`	`NBT_TAG_END = 0,`