[Freeciv-Dev] (PR#2326) Remove double includes

["Raimar Falke via RT" <rt@xxxxxxxxxxxxxx>]

$SUBJECT says all.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
  reality.sys corrupt. Reboot Universe? (y,n,q)

Index: client/audio.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/audio.c,v
retrieving revision 1.15
diff -u -r1.15 audio.c
--- client/audio.c      2002/11/07 16:04:52     1.15
+++ client/audio.c      2002/11/13 19:11:41
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "audio.h"
 #include "support.h"
 #include "fcintl.h"
 #include "log.h"
Index: client/options.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.h,v
retrieving revision 1.23
diff -u -r1.23 options.h
--- client/options.h    2002/11/12 23:19:42     1.23
+++ client/options.h    2002/11/13 19:11:42
@@ -14,7 +14,6 @@
 #define FC__OPTIONS_H
 
 #include "shared.h"            /* bool type */
-#include "events.h"
 
 #include "events.h"
 
Index: client/gui-mui/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gui_main.c,v
retrieving revision 1.65
diff -u -r1.65 gui_main.c
--- client/gui-mui/gui_main.c   2002/08/24 14:37:44     1.65
+++ client/gui-mui/gui_main.c   2002/11/13 19:11:46
@@ -74,7 +74,6 @@
 #include "ratesdlg.h"
 #include "repodlgs_g.h"
 #include "spaceshipdlg_g.h"
-#include "support.h"
 #include "tilespec.h"
 #include "wldlg.h"
 
Index: client/gui-mui/helpdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/helpdlg.c,v
retrieving revision 1.28
diff -u -r1.28 helpdlg.c
--- client/gui-mui/helpdlg.c    2002/03/06 10:05:34     1.28
+++ client/gui-mui/helpdlg.c    2002/11/13 19:11:47
@@ -28,7 +28,6 @@
 #include <proto/graphics.h>
 
 #include "city.h"
-#include "colors.h"
 #include "fcintl.h"
 #include "game.h"
 #include "genlist.h"
Index: client/gui-win32/chatline.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/chatline.c,v
retrieving revision 1.6
diff -u -r1.6 chatline.c
--- client/gui-win32/chatline.c 2002/07/21 17:52:58     1.6
+++ client/gui-win32/chatline.c 2002/11/13 19:11:48
@@ -13,7 +13,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <windows.h>
+#include <windowsx.h>
 
 #include "fcintl.h"
 #include "game.h"
@@ -47,9 +49,6 @@
 #include <stdio.h>
 
 #include "gui_main.h"
-#include <windows.h>
-#include <windowsx.h>
-
 
 /**************************************************************************
  Handles WM_COMMAND messages from the chatline
Index: client/gui-win32/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cityrep.c,v
retrieving revision 1.16
diff -u -r1.16 cityrep.c
--- client/gui-win32/cityrep.c  2002/09/25 20:24:53     1.16
+++ client/gui-win32/cityrep.c  2002/11/13 19:11:50
@@ -13,7 +13,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif        
-#include <stdlib.h>
  
 #include <stdio.h>
 #include <stdlib.h>
Index: client/gui-win32/mapctrl.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapctrl.c,v
retrieving revision 1.13
diff -u -r1.13 mapctrl.c
--- client/gui-win32/mapctrl.c  2002/07/28 14:19:31     1.13
+++ client/gui-win32/mapctrl.c  2002/11/13 19:11:51
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
                       
-#include <stdlib.h>
 #include "capability.h"
 #include "fcintl.h"
 #include "game.h"
Index: client/gui-xaw/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/citydlg.c,v
retrieving revision 1.80
diff -u -r1.80 citydlg.c
--- client/gui-xaw/citydlg.c    2002/11/07 15:04:18     1.80
+++ client/gui-xaw/citydlg.c    2002/11/13 19:11:56
@@ -25,7 +25,6 @@
 #include <X11/Xaw/MenuButton.h>
 #include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/SmeBSB.h>
-#include <X11/Xaw/Command.h>
 #include <X11/Xaw/List.h>
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/AsciiText.h>  
Index: client/gui-xaw/diplodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/diplodlg.c,v
retrieving revision 1.31
diff -u -r1.31 diplodlg.c
--- client/gui-xaw/diplodlg.c   2002/06/15 16:51:30     1.31
+++ client/gui-xaw/diplodlg.c   2002/11/13 19:11:58
@@ -26,7 +26,6 @@
 #include <X11/Xaw/List.h>
 #include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/MenuButton.h>
-#include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/SmeBSB.h>
 #include <X11/Xaw/SmeLine.h>
 #include <X11/Xaw/AsciiText.h>  
Index: client/gui-xaw/mapctrl.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/mapctrl.c,v
retrieving revision 1.57
diff -u -r1.57 mapctrl.c
--- client/gui-xaw/mapctrl.c    2002/10/07 17:08:25     1.57
+++ client/gui-xaw/mapctrl.c    2002/11/13 19:11:59
@@ -20,8 +20,6 @@
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
 
 #include <X11/Xaw/Scrollbar.h>
 #include <X11/Xaw/Form.h>
Index: client/gui-xaw/repodlgs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/repodlgs.c,v
retrieving revision 1.43
diff -u -r1.43 repodlgs.c
--- client/gui-xaw/repodlgs.c   2002/10/15 23:50:54     1.43
+++ client/gui-xaw/repodlgs.c   2002/11/13 19:12:01
@@ -29,7 +29,6 @@
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/List.h>
 #include <X11/Xaw/MenuButton.h>
-#include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/SmeBSB.h>
 #include <X11/Xaw/Toggle.h>
 
Index: client/gui-xaw/spaceshipdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/spaceshipdlg.c,v
retrieving revision 1.17
diff -u -r1.17 spaceshipdlg.c
--- client/gui-xaw/spaceshipdlg.c       2002/06/12 07:24:45     1.17
+++ client/gui-xaw/spaceshipdlg.c       2002/11/13 19:12:02
@@ -23,7 +23,6 @@
 #include <X11/Xaw/Label.h>
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/SimpleMenu.h>
-#include <X11/Xaw/Command.h>
 #include <X11/Xaw/List.h>
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/AsciiText.h>  
Index: client/gui-xaw/wldlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/wldlg.c,v
retrieving revision 1.21
diff -u -r1.21 wldlg.c
--- client/gui-xaw/wldlg.c      2002/04/05 05:56:47     1.21
+++ client/gui-xaw/wldlg.c      2002/11/13 19:12:05
@@ -26,7 +26,6 @@
 #include <X11/Xaw/MenuButton.h>
 #include <X11/Xaw/SimpleMenu.h>
 #include <X11/Xaw/SmeBSB.h>
-#include <X11/Xaw/Command.h>
 #include <X11/Xaw/List.h>
 #include <X11/Xaw/Viewport.h>
 #include <X11/Xaw/AsciiText.h>  
Index: common/connection.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/connection.h,v
retrieving revision 1.24
diff -u -r1.24 connection.h
--- common/connection.h 2002/11/11 10:00:47     1.24
+++ common/connection.h 2002/11/13 19:12:05
@@ -23,8 +23,7 @@
   Includes cmdlevel stuff, which is connection-based.
 ***************************************************************************/
 
-#include "shared.h"            /* MAX_LEN_ADDR */
-#include "shared.h"            /* bool type */
+#include "shared.h"            /* MAX_LEN_ADDR, bool type */
 
 struct player;
 struct timer_list;
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.129
diff -u -r1.129 packets.h
--- common/packets.h    2002/11/11 10:00:47     1.129
+++ common/packets.h    2002/11/13 19:12:08
@@ -13,6 +13,8 @@
 #ifndef FC__PACKETS_H
 #define FC__PACKETS_H
 
+struct connection;
+
 #include "connection.h"                /* struct connection, MAX_LEN_* */
 #include "map.h"
 #include "player.h"
Index: common/support.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/support.c,v
retrieving revision 1.22
diff -u -r1.22 support.c
--- common/support.c    2002/10/19 02:36:08     1.22
+++ common/support.c    2002/11/13 19:12:09
@@ -49,7 +49,6 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>            /* usleep, fcntl, gethostname */
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.194
diff -u -r1.194 citytools.c
--- server/citytools.c  2002/11/09 22:41:39     1.194
+++ server/citytools.c  2002/11/13 19:12:14
@@ -38,7 +38,6 @@
 #include "cityturn.h"
 #include "gamelog.h"
 #include "maphand.h"
-#include "player.h"
 #include "plrhand.h"
 #include "sernet.h"
 #include "settlers.h"