[Freeciv-Dev] (PR#12629) Make each header file self-contained

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12629 >


See $SUBJECT.

        Raimar

-- 
 email: i-freeciv-lists@xxxxxxxxxxxxx
 "When C++ is your hammer, everything looks like a thumb."
    -- Steven M. Haflich

Index: ai/aidata.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aidata.h,v
retrieving revision 1.26
diff -u -u -r1.26 aidata.h
--- ai/aidata.h 19 Mar 2005 15:34:18 -0000      1.26
+++ ai/aidata.h 25 Mar 2005 09:41:58 -0000
@@ -19,6 +19,7 @@
 #include "shared.h"            /* bool type */
 
 #include "fc_types.h"
+#include "improvement.h"
 
 /* 
  * This file and aidata.c contains global data structures for the AI
Index: ai/aisettler.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aisettler.h,v
retrieving revision 1.2
diff -u -u -r1.2 aisettler.h
--- ai/aisettler.h      29 Sep 2004 02:24:18 -0000      1.2
+++ ai/aisettler.h      25 Mar 2005 09:41:58 -0000
@@ -13,6 +13,13 @@
 #ifndef FC__AISETTLER_H
 #define FC__AISETTLER_H
 
+#include "city.h"
+#include "shared.h"            /* bool type */
+
+struct player;
+struct tile;
+struct ai_data;
+
 struct citytile {
   int food, shield, trade, reserved;
 };
Index: ai/aitech.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aitech.h,v
retrieving revision 1.7
diff -u -u -r1.7 aitech.h
--- ai/aitech.h 3 Feb 2005 09:48:53 -0000       1.7
+++ ai/aitech.h 25 Mar 2005 09:41:58 -0000
@@ -14,6 +14,7 @@
 #define FC__AITECH_H
 
 #include "fc_types.h"
+#include "unittype.h"
 
 void ai_manage_tech(struct player *pplayer); 
 void ai_next_tech_goal(struct player *pplayer);
Index: client/helpdata.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdata.h,v
retrieving revision 1.11
diff -u -u -r1.11 helpdata.h
--- client/helpdata.h   22 Jan 2005 19:45:39 -0000      1.11
+++ client/helpdata.h   25 Mar 2005 09:41:58 -0000
@@ -13,6 +13,10 @@
 #ifndef FC__HELPDATA_H
 #define FC__HELPDATA_H
 
+#include <stddef.h>            /* size_t */
+
+#include "improvement.h"       /* Impr_Type_id */
+
 #include "helpdlg_g.h"         /* enum help_page_type */
 
 struct help_item {
Index: client/gui-ftwl/gui_text.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-ftwl/gui_text.h,v
retrieving revision 1.2
diff -u -u -r1.2 gui_text.h
--- client/gui-ftwl/gui_text.h  29 Sep 2004 02:24:19 -0000      1.2
+++ client/gui-ftwl/gui_text.h  25 Mar 2005 09:41:58 -0000
@@ -11,6 +11,10 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
+struct tile;
+struct unit;
+struct city;
+
 const char *mapview_get_terrain_tooltip_text(struct tile *ptile);
 const char *mapview_get_unit_action_tooltip(struct unit *punit,
                                            const char *action,
Index: client/gui-gtk-2.0/messagewin.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/messagewin.h,v
retrieving revision 1.5
diff -u -u -r1.5 messagewin.h
--- client/gui-gtk-2.0/messagewin.h     25 Nov 2004 06:57:17 -0000      1.5
+++ client/gui-gtk-2.0/messagewin.h     25 Mar 2005 09:41:59 -0000
@@ -13,6 +13,8 @@
 #ifndef FC__MESSAGEWIN_H
 #define FC__MESSAGEWIN_H
 
+#include <gtk/gtk.h>
+
 #include "messagewin_g.h"
 
 GtkWidget *create_meswin_area(void);
Index: client/gui-gtk-2.0/pages.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/pages.h,v
retrieving revision 1.2
diff -u -u -r1.2 pages.h
--- client/gui-gtk-2.0/pages.h  24 Oct 2004 23:18:07 -0000      1.2
+++ client/gui-gtk-2.0/pages.h  25 Mar 2005 09:41:59 -0000
@@ -15,6 +15,8 @@
 
 #include <gtk/gtk.h>
 
+#include "shared.h"            /* bool type */
+
 #include "pages_g.h"
 
 extern GtkWidget *start_message_area;
Index: client/gui-xaw/inteldlg.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/inteldlg.h,v
retrieving revision 1.3
diff -u -u -r1.3 inteldlg.h
--- client/gui-xaw/inteldlg.h   26 Dec 2004 21:29:46 -0000      1.3
+++ client/gui-xaw/inteldlg.h   25 Mar 2005 09:42:00 -0000
@@ -13,6 +13,8 @@
 #ifndef FC__INTELDLG_H
 #define FC__INTELDLG_H
 
+#include <X11/Intrinsic.h>
+
 #include "inteldlg_g.h"
 
 void intel_dialog_msg_close(Widget w);
Index: common/aicore/citymap.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/aicore/citymap.h,v
retrieving revision 1.5
diff -u -u -r1.5 citymap.h
--- common/aicore/citymap.h     30 Sep 2004 12:17:16 -0000      1.5
+++ common/aicore/citymap.h     25 Mar 2005 09:42:00 -0000
@@ -15,6 +15,11 @@
 
 #include "fcintl.h"
 
+#include "shared.h"            /* bool type */
+
+struct tile;
+struct player;
+
 void citymap_turn_init(struct player *pplayer);
 void citymap_reserve_city_spot(struct tile *ptile, int id);
 void citymap_free_city_spot(struct tile *ptile, int id);
Index: server/commands.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/commands.h,v
retrieving revision 1.3
diff -u -u -r1.3 commands.h
--- server/commands.h   24 Dec 2004 04:01:48 -0000      1.3
+++ server/commands.h   25 Mar 2005 09:42:00 -0000
@@ -11,6 +11,8 @@
    GNU General Public License for more details.
 ***********************************************************************/
 
+#include "connection.h"                /* for enum cmdlevel_id */
+
 /**************************************************************************
   Commands - can be recognised by unique prefix
 **************************************************************************/
Index: server/generator/mapgen.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/mapgen.h,v
retrieving revision 1.2
diff -u -u -r1.2 mapgen.h
--- server/generator/mapgen.h   16 Sep 2004 09:53:11 -0000      1.2
+++ server/generator/mapgen.h   25 Mar 2005 09:42:00 -0000
@@ -13,6 +13,8 @@
 #ifndef FC__MAPGEN_H
 #define FC__MAPGEN_H
 
+#include "shared.h"            /* bool type */
+
 void map_fractal_generate(bool autosize);
 
 #endif  /* FC__MAPGEN_H */
Index: server/generator/mapgen_topology.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/mapgen_topology.h,v
retrieving revision 1.5
diff -u -u -r1.5 mapgen_topology.h
--- server/generator/mapgen_topology.h  25 Nov 2004 05:31:59 -0000      1.5
+++ server/generator/mapgen_topology.h  25 Mar 2005 09:42:00 -0000
@@ -13,6 +13,10 @@
 #ifndef FC__MAPGEN_TOPOLOGY_H
 #define FC__MAPGEN_TOPOLOGY_H
 
+#include "shared.h"            /* bool type */
+
+struct tile;
+
 /* this is the maximal colatitude at equators returned by 
    map_colatitude */
 
Index: server/generator/temperature_map.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/temperature_map.h,v
retrieving revision 1.3
diff -u -u -r1.3 temperature_map.h
--- server/generator/temperature_map.h  29 Sep 2004 02:24:24 -0000      1.3
+++ server/generator/temperature_map.h  25 Mar 2005 09:42:00 -0000
@@ -13,6 +13,9 @@
 #ifndef FC__TEMPERATURE_MAP_H
 #define FC__TEMPERATURE_MAP_H
 
+#include "shared.h"            /* bool type */
+
+struct tile;
 
 /*
  *  temperature_map[] stores the temperature of each tile
Index: server/generator/utilities.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/utilities.h,v
retrieving revision 1.5
diff -u -u -r1.5 utilities.h
--- server/generator/utilities.h        15 Oct 2004 09:39:06 -0000      1.5
+++ server/generator/utilities.h        25 Mar 2005 09:42:01 -0000
@@ -13,6 +13,10 @@
 #ifndef FC__UTILITIES_H
 #define FC__UTILITIES_H
 
+#include "shared.h"            /* bool type */
+
+struct tile;
+
 /* Provide a block to convert from native to map coordinates.  For instance
  *   do_in_map_pos(mx, my, xn, yn) {
  *     map_set_terrain(mx, my, T_OCEAN);
Index: utility/ftwl/be_common_24.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/ftwl/be_common_24.h,v
retrieving revision 1.3
diff -u -u -r1.3 be_common_24.h
--- utility/ftwl/be_common_24.h 9 Oct 2004 11:59:38 -0000       1.3
+++ utility/ftwl/be_common_24.h 25 Mar 2005 09:42:01 -0000
@@ -14,6 +14,8 @@
 #ifndef FC__BE_24_H
 #define FC__BE_24_H
 
+#include "common_types.h"
+
 #define ENABLE_IMAGE_ACCESS_CHECK      0
 
 /* Internal 32bpp format. */
Index: utility/ftwl/text_renderer.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/ftwl/text_renderer.h,v
retrieving revision 1.2
diff -u -u -r1.2 text_renderer.h
--- utility/ftwl/text_renderer.h        9 Oct 2004 11:59:38 -0000       1.2
+++ utility/ftwl/text_renderer.h        25 Mar 2005 09:42:01 -0000
@@ -14,6 +14,7 @@
 #include "common_types.h"
 
 struct tr_string_data;
+struct osda;
 
 void tr_init(void);
 void tr_draw_string(struct osda *target,
Index: utility/ftwl/theme_engine.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/ftwl/theme_engine.h,v
retrieving revision 1.4
diff -u -u -r1.4 theme_engine.h
--- utility/ftwl/theme_engine.h 9 Oct 2004 15:32:02 -0000       1.4
+++ utility/ftwl/theme_engine.h 25 Mar 2005 09:42:01 -0000
@@ -15,6 +15,7 @@
 #define FC__THEME_ENGINE_H
 
 #include "common_types.h"
+#include "widget.h"
 
 struct section_file;
 struct keybinding_list;