Include cleanups in gtk and gtk2:

Remove unneded includes
Add include wrappers where missing

svn path=/trunk/; revision=6191

40 files changed, 64 insertions, 214 deletions

diff --git a/gtk2/capture_dlg.c b/gtk2/capture_dlg.c
index 0014cacd8d..a7484d5d85 100644
--- a/gtk2/capture_dlg.c
+++ b/gtk2/capture_dlg.c
@@ -1,7 +1,7 @@
 /* capture_dlg.c
  * Routines for packet capture windows
  *
- * $Id: capture_dlg.c,v 1.4 2002/09/01 09:46:54 oabad Exp $
+ * $Id: capture_dlg.c,v 1.5 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,17 +28,9 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <gtk/gtk.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <time.h>
-
 #include <pcap.h>
 
 #include "capture.h"
diff --git a/gtk2/capture_prefs.c b/gtk2/capture_prefs.c
index d0548ebac7..7929bafc1e 100644
--- a/gtk2/capture_prefs.c
+++ b/gtk2/capture_prefs.c
@@ -1,7 +1,7 @@
 /* capture_prefs.c
  * Dialog box for capture preferences
  *
- * $Id: capture_prefs.c,v 1.2 2002/08/31 11:17:43 jmayer Exp $
+ * $Id: capture_prefs.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,8 +28,6 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include <string.h>
-#include <errno.h>
 #include <gtk/gtk.h>
 
 #include <pcap.h>
diff --git a/gtk2/color_dlg.c b/gtk2/color_dlg.c
index e763a1e323..aeff7be802 100644
--- a/gtk2/color_dlg.c
+++ b/gtk2/color_dlg.c
@@ -1,7 +1,7 @@
 /* color_dlg.c
  * Definitions for dialog boxes for color filters
  *
- * $Id: color_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: color_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,11 +28,8 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
 #include <string.h>
 
-#include <errno.h>
-
 #include "gtk/main.h"
 #include <epan/packet.h>
 #include "colors.h"
diff --git a/gtk2/color_utils.c b/gtk2/color_utils.c
index df13ebc1ad..94aaf2dbe2 100644
--- a/gtk2/color_utils.c
+++ b/gtk2/color_utils.c
@@ -2,7 +2,7 @@
  * Utilities for converting between "toolkit-independent" and GDK
  * notions of color
  *
- * $Id: color_utils.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: color_utils.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include <glib.h>
-
 #include <gtk/gtk.h>
 
 #include "prefs.h"	/* to declare "color_t" */
diff --git a/gtk2/colors.c b/gtk2/colors.c
index ca36bd5d0a..0aad705459 100644
--- a/gtk2/colors.c
+++ b/gtk2/colors.c
@@ -1,7 +1,7 @@
 /* colors.c
  * Definitions for color structures and routines
  *
- * $Id: colors.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: colors.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,15 +30,10 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <errno.h>
-
 #include <epan/filesystem.h>
 
-#include "gtk/main.h"
 #include <epan/packet.h>
 #include "colors.h"
 #include "file.h"
diff --git a/gtk2/colors.h b/gtk2/colors.h
index e12f41b904..35508dbea6 100644
--- a/gtk2/colors.h
+++ b/gtk2/colors.h
@@ -1,7 +1,7 @@
 /* colors.h
  * Definitions for color structures and routines
  *
- * $Id: colors.h,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: colors.h,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -24,11 +24,6 @@
 #ifndef  __COLORS_H__
 #define  __COLORS_H__
 
-#include  <epan/proto.h>
-#include  <epan/dfilter/dfilter.h>
-#include <gtk/gtk.h>
-#include  <epan/epan.h>
-
 #define MAXCOLORS	255
 #define MAX_COLOR_FILTER_NAME_LEN 33
 #define MAX_COLOR_FILTER_STRING_LEN 256
diff --git a/gtk2/column_prefs.c b/gtk2/column_prefs.c
index 062be11655..319719c5b3 100644
--- a/gtk2/column_prefs.c
+++ b/gtk2/column_prefs.c
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: column_prefs.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,9 +26,7 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
 #include <gtk/gtk.h>
-#include <string.h>
 
 #include "globals.h"
 #include "column_prefs.h"
diff --git a/gtk2/column_prefs.h b/gtk2/column_prefs.h
index 5d6396106c..285d7fa569 100644
--- a/gtk2/column_prefs.h
+++ b/gtk2/column_prefs.h
@@ -1,7 +1,7 @@
-/* gui_prefs.h
+/* column_prefs.h
  * Definitions for column preferences window
  *
- * $Id: column_prefs.h,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: column_prefs.h,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -23,7 +23,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef __COLUMN_PREFS_H__
+#define __COLUMN_PREFS_H__
+
 GtkWidget           *column_prefs_show(void);
 void                 column_prefs_fetch(GtkWidget *);
 void                 column_prefs_apply(GtkWidget *);
 void                 column_prefs_destroy(GtkWidget *);
+
+#endif
diff --git a/gtk2/decode_as_dlg.c b/gtk2/decode_as_dlg.c
index 06539f0984..5c4d0ab644 100644
--- a/gtk2/decode_as_dlg.c
+++ b/gtk2/decode_as_dlg.c
@@ -1,6 +1,6 @@
 /* decode_as_dlg.c
  *
- * $Id: decode_as_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: decode_as_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Routines to modify dissector tables on the fly.
  *
@@ -28,12 +28,6 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <errno.h>
-
 #include "decode_as_dlg.h"
 #include "dlg_utils.h"
 #include "globals.h"
diff --git a/gtk2/decode_as_dlg.h b/gtk2/decode_as_dlg.h
index 85c8db7268..8cfd8e46ae 100644
--- a/gtk2/decode_as_dlg.h
+++ b/gtk2/decode_as_dlg.h
@@ -1,6 +1,6 @@
-/* decode_as_dlg.c
+/* decode_as_dlg.h
  *
- * $Id: decode_as_dlg.h,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: decode_as_dlg.h,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Routines to modify dissector tables on the fly.
  *
diff --git a/gtk2/dfilter_expr_dlg.c b/gtk2/dfilter_expr_dlg.c
index 218c7319fa..240529679c 100644
--- a/gtk2/dfilter_expr_dlg.c
+++ b/gtk2/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -44,9 +44,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 
 #ifdef NEED_SNPRINTF_H
diff --git a/gtk2/display_opts.c b/gtk2/display_opts.c
index 941e9eb5e6..bfa8cea062 100644
--- a/gtk2/display_opts.c
+++ b/gtk2/display_opts.c
@@ -1,7 +1,7 @@
 /* display_opts.c
  * Routines for packet display windows
  *
- * $Id: display_opts.c,v 1.2 2002/09/01 09:46:54 oabad Exp $
+ * $Id: display_opts.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,20 +28,6 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <time.h>
-
-#ifdef HAVE_SYS_SOCKIO_H
-# include <sys/sockio.h>
-#endif
-
 #include "globals.h"
 #include <epan/resolv.h>
 #include <epan/timestamp.h>
diff --git a/gtk2/file_dlg.c b/gtk2/file_dlg.c
index b0ce5c25e0..bf5bf4ed81 100644
--- a/gtk2/file_dlg.c
+++ b/gtk2/file_dlg.c
@@ -1,7 +1,7 @@
 /* file_dlg.c
  * Dialog boxes for handling files
  *
- * $Id: file_dlg.c,v 1.2 2002/09/01 09:46:54 oabad Exp $
+ * $Id: file_dlg.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,17 +26,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
-
-#include <string.h>
-
-#include <glib.h>
+#include <gtk/gtk.h>
 
 #include <epan/filesystem.h>
 
diff --git a/gtk2/find_dlg.c b/gtk2/find_dlg.c
index 552b5e8c5a..2f979bc4d7 100644
--- a/gtk2/find_dlg.c
+++ b/gtk2/find_dlg.c
@@ -1,7 +1,7 @@
 /* find_dlg.c
  * Routines for "find frame" window
  *
- * $Id: find_dlg.c,v 1.2 2002/09/01 09:46:54 oabad Exp $
+ * $Id: find_dlg.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -29,12 +29,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <glib.h>
-
 #include <epan/proto.h>
 #include <epan/dfilter/dfilter.h>
 #include "globals.h"
diff --git a/gtk2/follow_dlg.c b/gtk2/follow_dlg.c
index 3a62e491ac..2f3f144c58 100644
--- a/gtk2/follow_dlg.c
+++ b/gtk2/follow_dlg.c
@@ -1,6 +1,6 @@
 /* follow_dlg.c
  *
- * $Id: follow_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: follow_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,16 +27,8 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#include <errno.h>
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_IO_H
 #include <io.h>			/* open/close on win32 */
 #endif
@@ -51,9 +43,6 @@
 
 #include <ctype.h>
 
-#include <langinfo.h>
-#include <iconv.h>
-
 #include "color.h"
 #include "color_utils.h"
 #include "file.h"
diff --git a/gtk2/goto_dlg.c b/gtk2/goto_dlg.c
index 46bf658e7d..ac2493f668 100644
--- a/gtk2/goto_dlg.c
+++ b/gtk2/goto_dlg.c
@@ -1,7 +1,7 @@
 /* goto_dlg.c
  * Routines for "go to frame" window
  *
- * $Id: goto_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: goto_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -29,14 +29,6 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <glib.h>
-
 #include <epan/proto.h>
 #include "globals.h"
 
diff --git a/gtk2/gtk2-rpcstat.c b/gtk2/gtk2-rpcstat.c
index f87d372a06..f705c56e11 100644
--- a/gtk2/gtk2-rpcstat.c
+++ b/gtk2/gtk2-rpcstat.c
@@ -1,7 +1,7 @@
 /* gtk2-rpcstat.c
  * rpcstat   2002 Ronnie Sahlberg
  *
- * $Id: gtk2-rpcstat.c,v 1.2 2002/09/05 06:46:38 sahlberg Exp $
+ * $Id: gtk2-rpcstat.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -32,15 +32,7 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <string.h>
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include "epan/packet_info.h"
 #include "tap.h"
 #include "tap-rpcstat.h"
diff --git a/gtk2/gtk2-rpcstat.h b/gtk2/gtk2-rpcstat.h
index d46f09e8a1..5b8d14a047 100644
--- a/gtk2/gtk2-rpcstat.h
+++ b/gtk2/gtk2-rpcstat.h
@@ -1,7 +1,7 @@
 /* gtk2-rpcstat.h
  * rpcstat   2002 Ronnie Sahlberg
  *
- * $Id: gtk2-rpcstat.h,v 1.1 2002/09/04 22:18:12 sahlberg Exp $
+ * $Id: gtk2-rpcstat.h,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -22,8 +22,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef __GTK2_RPCSTAT_H__
+#define __GTK2_RPCSTAT_H__
+
 void gtk2_rpcstat_init(guint32 program, guint32 version);
 void gtk2_rpcstat_cb(GtkWidget *w, gpointer d);
 
-
-
+#endif
diff --git a/gtk2/gtkglobals.h b/gtk2/gtkglobals.h
index 4889a3f7c8..702194dca4 100644
--- a/gtk2/gtkglobals.h
+++ b/gtk2/gtkglobals.h
@@ -1,7 +1,7 @@
 /* gtkglobals.h
  * GTK-related Global defines, etc.
  *
- * $Id: gtkglobals.h,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: gtkglobals.h,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -25,10 +25,6 @@
 #ifndef __GTKGLOBALS_H__
 #define __GTKGLOBALS_H__
 
-#ifndef __GTK_H__
-#include <gtk/gtk.h>
-#endif
-
 extern GtkWidget   *top_level, *packet_list, *tree_view, *byte_nb_ptr;
 extern PangoFontDescription *m_r_font, *m_b_font;
 
diff --git a/gtk2/gui_prefs.c b/gtk2/gui_prefs.c
index a7e7763407..41d41b59d4 100644
--- a/gtk2/gui_prefs.c
+++ b/gtk2/gui_prefs.c
@@ -1,7 +1,7 @@
 /* gui_prefs.c
  * Dialog box for GUI preferences
  *
- * $Id: gui_prefs.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: gui_prefs.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
 #include <gtk/gtk.h>
 
 #include "color.h"
diff --git a/gtk2/help_dlg.c b/gtk2/help_dlg.c
index 8d348dff35..175b4985f7 100644
--- a/gtk2/help_dlg.c
+++ b/gtk2/help_dlg.c
@@ -1,6 +1,6 @@
 /* help_dlg.c
  *
- * $Id: help_dlg.c,v 1.1 2002/08/31 09:55:21 oabad Exp $
+ * $Id: help_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -28,9 +28,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #ifdef NEED_SNPRINTF_H
 # include "snprintf.h"
diff --git a/gtk2/main.c b/gtk2/main.c
index 1dcd6bede5..652d30a662 100644
--- a/gtk2/main.c
+++ b/gtk2/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.3 2002/09/05 06:46:38 sahlberg Exp $
+ * $Id: main.c,v 1.4 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -41,31 +41,13 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <errno.h>
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_IO_H
 #include <io.h> /* open/close on win32 */
 #endif
 
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
-
-#include <signal.h>
-
 #ifdef HAVE_LIBPCAP
 #include <pcap.h>
 #endif
diff --git a/gtk2/menu.c b/gtk2/menu.c
index fe8e8d241f..63e07e2d68 100644
--- a/gtk2/menu.c
+++ b/gtk2/menu.c
@@ -1,7 +1,7 @@
 /* menu.c
  * Menu routines
  *
- * $Id: menu.c,v 1.2 2002/09/04 22:19:42 sahlberg Exp $
+ * $Id: menu.c,v 1.3 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,10 +27,8 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <glib.h>
 
 #include <string.h>
-#include <stdio.h>
 
 #include "../menu.h"
 
diff --git a/gtk2/nameres_prefs.c b/gtk2/nameres_prefs.c
index 11e5c03746..fa10cda61b 100644
--- a/gtk2/nameres_prefs.c
+++ b/gtk2/nameres_prefs.c
@@ -1,7 +1,7 @@
 /* nameres_prefs.c
  * Dialog box for name resolution preferences
  *
- * $Id: nameres_prefs.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: nameres_prefs.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,8 +26,6 @@
 #include "config.h"
 #endif
 
-#include <string.h>
-#include <errno.h>
 #include <gtk/gtk.h>
 
 #include "globals.h"
diff --git a/gtk2/packet_win.c b/gtk2/packet_win.c
index e1cffbdef3..9bb4b161b4 100644
--- a/gtk2/packet_win.c
+++ b/gtk2/packet_win.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet_win.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: packet_win.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,14 +37,8 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <epan/epan.h>
 #include "main.h"
 #include <epan/timestamp.h>
diff --git a/gtk2/plugins_dlg.c b/gtk2/plugins_dlg.c
index 4e0b958d36..a6148efbfb 100644
--- a/gtk2/plugins_dlg.c
+++ b/gtk2/plugins_dlg.c
@@ -1,7 +1,7 @@
 /* plugins_dlg.c
  * Dialog boxes for plugins
  *
- * $Id: plugins_dlg.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: plugins_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,17 +26,8 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
 #include <gtk/gtk.h>
 
-#include "globals.h"
 #include <epan/plugins.h>
 #include "dlg_utils.h"
 
diff --git a/gtk2/prefs_dlg.c b/gtk2/prefs_dlg.c
index 877a556934..c7d80b69be 100644
--- a/gtk2/prefs_dlg.c
+++ b/gtk2/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: prefs_dlg.c,v 1.2 2002/09/05 18:48:51 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -28,18 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 
 #include <epan/filesystem.h>
 
diff --git a/gtk2/print_dlg.c b/gtk2/print_dlg.c
index a53dc45abe..b2c014b632 100644
--- a/gtk2/print_dlg.c
+++ b/gtk2/print_dlg.c
@@ -1,7 +1,7 @@
 /* print_dlg.c
  * Dialog boxes for printing
  *
- * $Id: print_dlg.c,v 1.2 2002/09/01 09:46:54 oabad Exp $
+ * $Id: print_dlg.c,v 1.3 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,8 +26,6 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
-
 #include <gtk/gtk.h>
 
 #include "globals.h"
diff --git a/gtk2/print_mswin.c b/gtk2/print_mswin.c
index 6b5f0a857f..20ec2d337c 100644
--- a/gtk2/print_mswin.c
+++ b/gtk2/print_mswin.c
@@ -33,8 +33,6 @@
 #include <winspool.h>
 #endif
 
-#include <stdio.h>
-
 BOOL CALLBACK abort_proc( HDC hDC, int Error );
 HDC get_printer_dc(void);
 void init_doc_struct( DOCINFO* di, char* docname);
diff --git a/gtk2/print_mswin.h b/gtk2/print_mswin.h
index a7159e46c6..f714f4f5ec 100644
--- a/gtk2/print_mswin.h
+++ b/gtk2/print_mswin.h
@@ -22,6 +22,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-
+#ifndef __PRINT_MSWIN_H__
+#define __PRINT_MSWIN_H__
 
 void print_mswin(char *file_name);
+
+#endif
diff --git a/gtk2/progress_dlg.c b/gtk2/progress_dlg.c
index 1adb2c9f9e..e197d9ba45 100644
--- a/gtk2/progress_dlg.c
+++ b/gtk2/progress_dlg.c
@@ -1,7 +1,7 @@
 /* progress_dlg.c
  * Routines for progress-bar (modal) dialog
  *
- * $Id: progress_dlg.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: progress_dlg.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,6 +26,7 @@
 # include "config.h"
 #endif
 
+#include <gtk/gtk.h>
 #include "gtkglobals.h"
 #include "dlg_utils.h"
 #include "progress_dlg.h"
diff --git a/gtk2/proto_dlg.c b/gtk2/proto_dlg.c
index 957f407d8f..6d886c93a5 100644
--- a/gtk2/proto_dlg.c
+++ b/gtk2/proto_dlg.c
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: proto_dlg.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -28,9 +28,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "prefs.h"
 #include "globals.h"
diff --git a/gtk2/proto_draw.c b/gtk2/proto_draw.c
index 7848fe47ef..df615630a3 100644
--- a/gtk2/proto_draw.c
+++ b/gtk2/proto_draw.c
@@ -1,7 +1,7 @@
 /* proto_draw.c
  * Routines for GTK+ packet display
  *
- * $Id: proto_draw.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: proto_draw.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,14 +30,10 @@
 #endif
 
 #include <ctype.h>
-#include <stdarg.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include <epan/epan_dissect.h>
 
 #include "main.h"
diff --git a/gtk2/proto_hier_stats_dlg.h b/gtk2/proto_hier_stats_dlg.h
index b88b6016fc..43bd4b3a3f 100644
--- a/gtk2/proto_hier_stats_dlg.h
+++ b/gtk2/proto_hier_stats_dlg.h
@@ -1,6 +1,6 @@
 /* proto_hier_stats_dlg.h
  *
- * $Id: proto_hier_stats_dlg.h,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: proto_hier_stats_dlg.h,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -22,6 +22,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef __PROTO_HIER_STATS_DLG_H__
+#define __PROTO_HIER_STATS_DLG_H__
 
 void
 proto_hier_stats_cb(GtkWidget *w, gpointer d);
+
+#endif
diff --git a/gtk2/simple_dialog.c b/gtk2/simple_dialog.c
index 1930986760..96a0ab3916 100644
--- a/gtk2/simple_dialog.c
+++ b/gtk2/simple_dialog.c
@@ -1,7 +1,7 @@
 /* simple_dialog.c
  * Simple message dialog box routines.
  *
- * $Id: simple_dialog.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: simple_dialog.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,11 +27,8 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
-
 #include <gtk/gtk.h>
 
-#include <stdarg.h>
 #include <stdio.h>
 
 #ifdef NEED_SNPRINTF_H
diff --git a/gtk2/stream_prefs.c b/gtk2/stream_prefs.c
index 72163e616e..eb21b90075 100644
--- a/gtk2/stream_prefs.c
+++ b/gtk2/stream_prefs.c
@@ -1,7 +1,7 @@
 /* stream_prefs.c
  * Dialog boxes for preferences for the stream window
  *
- * $Id: stream_prefs.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: stream_prefs.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,7 +26,6 @@
 #include "config.h"
 #endif
 
-#include <errno.h>
 #include <gtk/gtk.h>
 
 #include "color.h"
diff --git a/gtk2/summary_dlg.c b/gtk2/summary_dlg.c
index 1c4c27a47c..efd8704822 100644
--- a/gtk2/summary_dlg.c
+++ b/gtk2/summary_dlg.c
@@ -1,7 +1,7 @@
 /* summary_dlg.c
  * Routines for capture file summary window
  *
- * $Id: summary_dlg.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: summary_dlg.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -30,8 +30,6 @@
 
 #include <gtk/gtk.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <wtap.h>
 
 #ifdef NEED_SNPRINTF_H
diff --git a/gtk2/tcp_graph.c b/gtk2/tcp_graph.c
index 70325ac2e8..94903da8b5 100644
--- a/gtk2/tcp_graph.c
+++ b/gtk2/tcp_graph.c
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: tcp_graph.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,8 +30,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <stdio.h>
-#include <string.h>
 #include <math.h>		/* rint() */
 
 #ifdef NEED_SNPRINTF_H
diff --git a/gtk2/tcp_graph.h b/gtk2/tcp_graph.h
index 3cc23956d8..b55995596c 100644
--- a/gtk2/tcp_graph.h
+++ b/gtk2/tcp_graph.h
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.h,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: tcp_graph.h,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -24,4 +24,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef __TCP_GRAPH_H__
+#define __TCP_GRAPH_H__
+
 extern void tcp_graph_cb (GtkWidget *, gpointer, guint);
+
+#endif
diff --git a/gtk2/ui_util.c b/gtk2/ui_util.c
index 690b3e7795..64f67e4ca8 100644
--- a/gtk2/ui_util.c
+++ b/gtk2/ui_util.c
@@ -1,7 +1,7 @@
 /* ui_util.c
  * UI utility routines
  *
- * $Id: ui_util.c,v 1.1 2002/08/31 09:55:22 oabad Exp $
+ * $Id: ui_util.c,v 1.2 2002/09/05 18:48:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,8 +26,6 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
-
 #include <gtk/gtk.h>
 
 #include "gtkglobals.h"