sort #includes by directories

svn path=/trunk/; revision=24967

41 files changed, 518 insertions, 446 deletions

diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c
index ac12e0f8d7..df104d421a 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -35,19 +35,21 @@
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
 #endif
-#include "about_dlg.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "file_dlg.h"
-#include "globals.h"
-#include "log.h"
-#include "text_page.h"
+
+#include "../globals.h"
+#include "../log.h"
+#include "../version_info.h"
+
+#include "gtk/about_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/file_dlg.h"
+#include "gtk/text_page.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/main.h"
+#include "gtk/plugins_dlg.h"
 
 #include "../image/wssplash.xpm"
-#include "gtkglobals.h"
-#include "version_info.h"
-#include "main.h"
-#include "plugins_dlg.h"
 
 static void about_wireshark_destroy_cb(GtkWidget *, gpointer);
 
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c
index f828112d43..8eb492eebc 100644
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.c
@@ -38,20 +38,21 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-
 #include <epan/tap.h>
 #include <epan/dissectors/packet-afp.h>
+
 #include "../register.h"
 #include "../timestats.h"
 #include "../simple_dialog.h"
-#include "gui_utils.h" 
-#include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_dlg.h"
-#include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "tap_dfilter_dlg.h"
+
+#include "gtk/gui_utils.h" 
+#include "gtk/dlg_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/tap_dfilter_dlg.h"
 
 
 /* used to keep track of the statistics for an entire program interface */
diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index c4a090fbfd..41b0550548 100644
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -32,8 +32,7 @@
 #ifdef HAVE_AIRPCAP
 
 #include <gtk/gtk.h>
-#include <glib.h>
-#include <glib/gprintf.h>
+//#include <glib/gprintf.h>
 
 #include <string.h>
 
@@ -46,22 +45,23 @@
 
 #include <pcap.h>
 
-#include "gtk/main.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "simple_dialog.h"
-#include "dfilter_expr_dlg.h"
-#include "stock_icons.h"
-#include "gtkglobals.h"
-#include "help_dlg.h"
+#include "../simple_dialog.h"
 
+#include "gtk/main.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dfilter_expr_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/help_dlg.h"
+#include "gtk/keys.h"
 
 #include <airpcap.h>
 #include "airpcap_loader.h"
 #include "airpcap_gui_utils.h"
 #include "airpcap_dlg.h"
 
-#include "keys.h"
+
 
 /* temporary block signals to widgets */
 BOOL block_advanced_signals;
diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index 198d1a80de..12f6a8658d 100644
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -40,18 +40,19 @@
 #include <epan/frequency-utils.h>
 #include <epan/crypt/airpdcap_ws.h>
 
+#include "../simple_dialog.h"
+
 #include "gtk/main.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "simple_dialog.h"
-#include "dfilter_expr_dlg.h"
-#include "help_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dfilter_expr_dlg.h"
+#include "gtk/help_dlg.h"
+#include "gtk/keys.h"
 
 #include <airpcap.h>
 #include "airpcap_loader.h"
 #include "airpcap_gui_utils.h"
 
-#include "keys.h"
 
 /* Controls the releay of settings back to the adapter. */
 gboolean change_airpcap_settings = FALSE;
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index b5bc10dca8..9d528a6345 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -41,19 +41,22 @@
 #include "epan/epan.h"
 #include "epan/value_string.h"
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "image/clist_ascend.xpm"
-#include "image/clist_descend.xpm"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
 #include <epan/tap.h>
-#include "../register.h"
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
+
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
+#include "../register.h"
 #include "../globals.h"
-#include "filter_dlg.h"
-#include "gui_utils.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/gui_utils.h"
+
+#include "image/clist_ascend.xpm"
+#include "image/clist_descend.xpm"
 
 
 typedef struct column_arrows {
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 1b324bd569..c0b7b718dd 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -37,22 +37,25 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "epan/value_string.h"
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+#include <epan/value_string.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "image/clist_ascend.xpm"
-#include "image/clist_descend.xpm"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
 #include <epan/tap.h>
+#include <epan/dissectors/packet-ansi_map.h>
+
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_dlg.h"
-#include <epan/dissectors/packet-ansi_map.h>
-#include "gui_utils.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/gui_utils.h"
+
+#include "image/clist_ascend.xpm"
+#include "image/clist_descend.xpm"
 
 
 typedef struct column_arrows {
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 4d9fcb328d..88b97442dd 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -32,15 +32,17 @@
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-
-#include "simple_dialog.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
 #include <epan/tap.h>
+
+#include "../simple_dialog.h"
 #include "../register.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "tap_dfilter_dlg.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/tap_dfilter_dlg.h"
+
 
 typedef const char* bootp_info_value_t;
 
diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c
index de204fbc5d..e8980b7111 100644
--- a/gtk/camel_counter.c
+++ b/gtk/camel_counter.c
@@ -34,25 +34,26 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "epan/value_string.h"
-#include "epan/tap.h"
-
-#include "register.h"
-#include "timestats.h"
-#include "simple_dialog.h"
-#include "file.h"
-#include "globals.h"
-#include "stat_menu.h"
-#include "tap_dfilter_dlg.h"
+#include <epan/epan.h>
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
+#include <epan/tap.h>
+#include <epan/packet.h>
+#include <epan/asn1.h>
+#include <epan/camel-persistentdata.h>
+
+#include "../globals.h"
+#include "../stat_menu.h"
+#include "../register.h"
+#include "../timestats.h"
+#include "../simple_dialog.h"
 
 #include "gtk/main.h"
 #include "gtk/dlg_utils.h"
 #include "gtk/gui_utils.h"
 #include "gtk/gui_stat_util.h"
-#include "epan/asn1.h"
-#include "epan/camel-persistentdata.h"
+#include "gtk/tap_dfilter_dlg.h"
+
 
 static void gtk_camelcounter_reset(void *phs);
 static int gtk_camelcounter_packet(void *phs,
diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c
index 376b3719e2..9db019f054 100644
--- a/gtk/camel_srt.c
+++ b/gtk/camel_srt.c
@@ -34,27 +34,28 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "epan/value_string.h"
-#include "epan/tap.h"
-
-#include "register.h"
-#include "timestats.h"
-#include "simple_dialog.h"
-#include "file.h"
-#include "globals.h"
-#include "stat_menu.h"
-#include "tap_dfilter_dlg.h"
+#include <epan/packet_info.h>
+#include <epan/epan.h>
+#include <epan/value_string.h>
+#include <epan/tap.h>
+#include <epan/packet.h>
+#include <epan/asn1.h>
+#include <epan/camel-persistentdata.h>
+
+#include "../register.h"
+#include "../timestats.h"
+#include "../simple_dialog.h"
+#include "../file.h"
+#include "../globals.h"
+#include "../stat_menu.h"
 
 #include "gtk/main.h"
 #include "gtk/dlg_utils.h"
 #include "gtk/gui_utils.h"
 #include "gtk/gui_stat_util.h"
+#include "gtk/tap_dfilter_dlg.h"
 #include "gtk/service_response_time_table.h"
 
-#include "epan/asn1.h"
-#include "epan/camel-persistentdata.h"
 
 /* used to keep track of the statistics for an entire program interface */
 struct camelsrt_t {
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 0f17aec1e3..09d7f30f32 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -33,38 +33,41 @@
 #endif
 
 #include <string.h>
+//#include <stdio.h>        /* main_menu.h needs FILE XXX - true?*/
+
 #include <gtk/gtk.h>
-#include <stdio.h>        /* main_menu.h needs FILE XXX - true?*/
 
 #include <epan/packet.h>
-#include "capture.h"
-#include "globals.h"
 #include <epan/addr_resolv.h>
-#include "main.h"
-#include "main_menu.h"
-#include "gui_utils.h"
-#include "capture_dlg.h"
-#include "capture_errs.h"
-#include "filter_dlg.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "file_dlg.h"
-#include "capture-pcap-util.h"
-#include "capture_ui_utils.h"
 #include <epan/prefs.h>
-#include "ringbuffer.h"
 #include <epan/filesystem.h>
-#include "stock_icons.h"
-#include "capture_file_dlg.h"
-#include "help_dlg.h"
-#include "gtkglobals.h"
-#include "cfilter_combo_utils.h"
+
+#include "../capture.h"
+#include "../globals.h"
+#include "../capture_errs.h"
+#include "../simple_dialog.h"
+#include "../capture-pcap-util.h"
+#include "../capture_ui_utils.h"
+#include "../ringbuffer.h"
+
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/gui_utils.h"
+#include "gtk/capture_dlg.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/file_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/help_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/cfilter_combo_utils.h"
 
 #ifdef _WIN32
-#include "capture-wpcap.h"
+#include "../capture-wpcap.h"
 #endif
 
-#include "keys.h"
+#include "gtk/keys.h"
 
 #ifdef HAVE_AIRPCAP
 #include <airpcap.h>
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index fd7b61d1e5..066485a412 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -26,52 +26,54 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
 
 #include "packet-range.h"
 #include <epan/filesystem.h>
-
-#include "globals.h"
-#include "gtkglobals.h"
 #include <epan/addr_resolv.h>
-#include "keys.h"
-#include "filter_dlg.h"
-#include "gui_utils.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "file_dlg.h"
-#include "capture_file_dlg.h"
-#include "drag_and_drop.h"
-#include "main.h"
-#include "main_menu.h"
 #include <epan/prefs.h>
-#include "recent.h"
-#include "color.h"
+
+#include "../globals.h"
+#include "../alert_box.h"
+#include "../simple_dialog.h"
+#include "../color.h"
 #include "../ui_util.h"
-#include "color_filters.h"
-#include "gtk/color_dlg.h"
-#ifdef HAVE_LIBPCAP
-#include "capture_dlg.h"
-#endif
-#include "stock_icons.h"
-#include "range_utils.h"
-#include "merge.h"
-#include "util.h"
+#include "../color_filters.h"
+#include "../merge.h"
+#include "../util.h"
 #include <wiretap/file_util.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "gtk/gtkglobals.h"
+#include "gtk/keys.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/file_dlg.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/drag_and_drop.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/recent.h"
+#include "gtk/color_dlg.h"
+#ifdef HAVE_LIBPCAP
+#include "gtk/capture_dlg.h"
 #endif
+#include "gtk/stock_icons.h"
+#include "gtk/range_utils.h"
 
 #if _WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
-#include "win32-file-dlg.h"
+#include "gtk/win32-file-dlg.h"
 #endif
 
+
 static void file_open_ok_cb(GtkWidget *w, gpointer fs);
 static void file_open_destroy_cb(GtkWidget *win, gpointer user_data);
 static void file_merge_ok_cb(GtkWidget *w, gpointer fs);
diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c
index ff75d56f10..fade0494f6 100644
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg.c
@@ -29,25 +29,29 @@
 
 #if defined HAVE_LIBPCAP && defined _WIN32
 
+#include <time.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 
-#include <wtap.h>
-#include <time.h>
-
-#include "globals.h"
-#include "file.h"
-#include "capture.h"
-#include "main.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "help_dlg.h"
-
 #include <epan/value_string.h>
 #include <epan/addr_resolv.h>
 
-#include "gtkvumeter.h"
+#include "../globals.h"
+#include "../file.h"
+#include "../capture.h"
+#include "../capture_wpcap_packet.h"
+#include "../simple_dialog.h"
+#include <wiretap/wtap.h>
+
+#include "gtk/main.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/help_dlg.h"
+#include "gtk/gtkvumeter.h"
+#include "gtk/capture_if_details_dlg.h"
+
+
 
 /* packet32.h requires sockaddr_storage 
  * wether sockaddr_storage is defined or not depends on the Platform SDK 
@@ -94,11 +98,6 @@ struct sockaddr_storage {
 #include <windowsx.h>
 #include <Ntddndis.h>
 
-#include "capture_wpcap_packet.h"
-#include "capture_if_details_dlg.h"
-
-#include "simple_dialog.h"
-
 #define DETAILS_STR_MAX     1024
 
 
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 471d0f891d..dc546e2550 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -35,33 +35,31 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include "globals.h"
-#include "capture-pcap-util.h"
-
-#ifdef _WIN32
-#include "capture-wpcap.h"
-#endif
-
-#include "stock_icons.h"
-#include "simple_dialog.h"
-#include "capture.h"
-#include "capture_dlg.h"
-#include "capture_if_details_dlg.h"
-#include "capture_errs.h"
-#include "capture_ui_utils.h"
-#include "recent.h"
 #include <epan/prefs.h>
 
-#include "gui_utils.h"
-#include "dlg_utils.h"
+#include "../globals.h"
+#include "../capture-pcap-util.h"
+#include "../simple_dialog.h"
+#include "../capture.h"
+#include "../capture_errs.h"
+#include "../capture_ui_utils.h"
+#include <wiretap/wtap.h>
 
-#include "main.h"
-#include "main_toolbar.h"
-#include "wtap.h"
-#include "help_dlg.h"
-#include "keys.h"
+#ifdef _WIN32
+#include "../capture-wpcap.h"
+#endif
 
-#include "webbrowser.h"
+#include "gtk/stock_icons.h"
+#include "gtk/capture_dlg.h"
+#include "gtk/capture_if_details_dlg.h"
+#include "gtk/recent.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/main.h"
+#include "gtk/main_toolbar.h"
+#include "gtk/help_dlg.h"
+#include "gtk/keys.h"
+#include "gtk/webbrowser.h"
 
 #ifdef HAVE_AIRPCAP
 #include "../image/toolbar/capture_airpcap_16.xpm"
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index fbe792a191..6af39011c7 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -26,29 +26,30 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_LIBPCAP
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
 #include <string.h>
-
-#ifdef HAVE_LIBPCAP
+#include <time.h>
 
 #include <gtk/gtk.h>
-#include "gtk/stock_icons.h"
-
-#include <time.h>
 
 #include <epan/packet.h>
-#include "capture.h"
-#include "capture_info.h"
-#include "globals.h"
-#include "capture_ui_utils.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "main.h"
-#include "capture-pcap-util.h"
-#include "help_dlg.h"
+
+#include "../capture.h"
+#include "../capture_info.h"
+#include "../globals.h"
+#include "../capture_ui_utils.h"
+#include "../capture-pcap-util.h"
+
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/main.h"
+#include "gtk/help_dlg.h"
+#include "gtk/stock_icons.h"
 
 #ifdef HAVE_AIRPCAP
 #include <airpcap.h>
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 020e6ead5a..285d73c83d 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -31,20 +31,23 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "globals.h"
-#include "capture_prefs.h"
 #include <epan/prefs.h>
-#include "prefs_dlg.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "simple_dialog.h"
-#include "capture-pcap-util.h"
-#include "capture_ui_utils.h"
-#include "main.h"
-#include "stock_icons.h"
-#include "capture.h"
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+#include "../capture-pcap-util.h"
+#include "../capture_ui_utils.h"
+#include "../capture.h"
+
+#include "gtk/capture_prefs.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/main.h"
+#include "gtk/stock_icons.h"
 #include <epan/strutil.h>
 
+
 #define DEVICE_KEY				"device"
 #define PROM_MODE_KEY			"prom_mode"
 #define CAPTURE_REAL_TIME_KEY	"capture_real_time"
diff --git a/gtk/cfilter_combo_utils.c b/gtk/cfilter_combo_utils.c
index b0c1ac4a74..b71123b391 100644
--- a/gtk/cfilter_combo_utils.c
+++ b/gtk/cfilter_combo_utils.c
@@ -27,13 +27,14 @@
 #endif
 
 #include <string.h>
+
 #include <gtk/gtk.h>
-#include "main.h"
-#include "gtkglobals.h"
-#include "cfilter_combo_utils.h"
-#include "recent.h"
-#ifdef HAVE_LIBPCAP
-#endif
+
+#include "gtk/main.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/cfilter_combo_utils.h"
+#include "gtk/recent.h"
+
 
 /* XXX: use a preference for this setting! */
 static guint cfilter_combo_max_recent = 20;
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index bbfa7ec7ee..753e059559 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -26,30 +26,32 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-
 #include <string.h>
 
-#include "gtk/main.h"
+#include <gtk/gtk.h>
+
 #include <epan/packet.h>
-#include "color.h"
-#include "colors.h"
-#include "color_filters.h"
-#include "color_dlg.h"
-#include "file.h"
 #include <epan/dfilter/dfilter.h>
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "dfilter_expr_dlg.h"
-#include "stock_icons.h"
-#include "filter_dlg.h"
-#include "capture_file_dlg.h"
-#include "gtkglobals.h"
 #include <epan/prefs.h>
-#include "help_dlg.h"
 
-#include "color_edit_dlg.h"
+#include "../color.h"
+#include "../color_filters.h"
+#include "../file.h"
+#include "../simple_dialog.h"
+
+#include "gtk/main.h"
+#include "gtk/colors.h"
+#include "gtk/color_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dfilter_expr_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/help_dlg.h"
+#include "gtk/color_edit_dlg.h"
+
 
 #define BUTTON_SIZE_X -1
 #define BUTTON_SIZE_Y -1
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 64f3a67e0e..f1e9518e79 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -31,18 +31,19 @@
 #include <gtk/gtk.h>
 
 #include <epan/packet.h>
-#include "color.h"
-#include "colors.h"
-#include "color_filters.h"
-
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "stock_icons.h"
-#include "filter_dlg.h"
-#include "dfilter_expr_dlg.h"
-#include "simple_dialog.h"
-
-#include "color_edit_dlg.h"
+
+#include "../color.h"
+#include "../color_filters.h"
+#include "../simple_dialog.h"
+
+#include "gtk/colors.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/stock_icons.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/dfilter_expr_dlg.h"
+#include "gtk/color_edit_dlg.h"
+
 
 #define BUTTON_SIZE_X -1
 #define BUTTON_SIZE_Y -1
diff --git a/gtk/color_utils.c b/gtk/color_utils.c
index 3c6f008f41..cee6d8a955 100644
--- a/gtk/color_utils.c
+++ b/gtk/color_utils.c
@@ -28,9 +28,9 @@
 
 #include <gtk/gtk.h>
 
-#include "color.h"
+#include "../color.h"
 
-#include "colors.h"
+#include "gtk/colors.h"
 
 /*
  * Initialize a color with R, G, and B values, including any toolkit-dependent
diff --git a/gtk/colors.c b/gtk/colors.c
index 872a16aae0..4793b47a56 100644
--- a/gtk/colors.c
+++ b/gtk/colors.c
@@ -29,11 +29,11 @@
 
 #include <string.h>
 
-#include "color.h"	/* to declare "color_t" */
+#include "../color.h"	/* to declare "color_t" */
+#include "../simple_dialog.h"
 
-#include "colors.h"
-#include "simple_dialog.h"
-#include "gtkglobals.h"
+#include "gtk/colors.h"
+#include "gtk/gtkglobals.h"
 
 static GdkColormap*	sys_cmap;
 static GdkColormap*	our_cmap = NULL;
diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index c40af5571d..31a506c844 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -28,14 +28,18 @@
 
 #include <gtk/gtk.h>
 
-#include "globals.h"
-#include "column_prefs.h"
-#include "gtkglobals.h"
 #include <epan/prefs.h>
+#include <epan/column_info.h>
 #include <epan/column.h>
-#include "gui_utils.h"
-#include "main_packet_list.h"
-#include "filter_dlg.h"
+
+#include "../globals.h"
+
+#include "gtk/column_prefs.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/main_packet_list.h"
+#include "gtk/filter_dlg.h"
+
 
 static GtkWidget *column_l, *del_bt, *title_te, *field_te, *fmt_m, *up_bt, *dn_bt;
 static gint       cur_fmt, cur_row;
diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c
index d25c5e2994..af0a5c8b3e 100644
--- a/gtk/conversations_eth.c
+++ b/gtk/conversations_eth.c
@@ -30,17 +30,21 @@
 # include <sys/types.h>
 #endif
 
-#include <gtk/gtk.h>
 #include <string.h>
-#include "epan/packet.h"
+
+#include <gtk/gtk.h>
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-eth.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c
index cf34e91ba9..2903343fdd 100644
--- a/gtk/conversations_fc.c
+++ b/gtk/conversations_fc.c
@@ -29,20 +29,23 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-scsi.h>
 #include <epan/dissectors/packet-fc.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c
index 0f95870b7d..e7eddf861e 100644
--- a/gtk/conversations_fddi.c
+++ b/gtk/conversations_fddi.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
+
 #include "epan/packet.h"
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-fddi.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_ip.c b/gtk/conversations_ip.c
index 68454f3c37..3a6f79860c 100644
--- a/gtk/conversations_ip.c
+++ b/gtk/conversations_ip.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-ip.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c
index 53f288cb09..1f5b01930f 100644
--- a/gtk/conversations_ipx.c
+++ b/gtk/conversations_ipx.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-ipx.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c
index a6ac37c818..83f91aefad 100644
--- a/gtk/conversations_jxta.c
+++ b/gtk/conversations_jxta.c
@@ -30,18 +30,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-jxta.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_ncp.c b/gtk/conversations_ncp.c
index d0bd37ea73..b72899b505 100644
--- a/gtk/conversations_ncp.c
+++ b/gtk/conversations_ncp.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-ncp-int.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_rsvp.c b/gtk/conversations_rsvp.c
index 70503b50c0..ec65735bd8 100644
--- a/gtk/conversations_rsvp.c
+++ b/gtk/conversations_rsvp.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-rsvp.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c
index 87fc13468f..4f0cd0a983 100644
--- a/gtk/conversations_sctp.c
+++ b/gtk/conversations_sctp.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-sctp.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 1b3232f477..2a6bcce101 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -44,20 +44,22 @@
 #include <epan/tap.h>
 #include <epan/nstime.h>
 
-#include "sat.h"
-#include "conversations_table.h"
+#include "../simple_dialog.h"
+#include "../globals.h"
+#include "../color.h"
+
+#include "gtk/sat.h"
+#include "gtk/conversations_table.h"
+#include "gtk/find_dlg.h"
+#include "gtk/color_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/help_dlg.h"
+
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
-#include "simple_dialog.h"
-#include "globals.h"
-#include "find_dlg.h"
-#include "color.h"
-#include "gtk/color_dlg.h"
-#include "gtkglobals.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "help_dlg.h"
 
 
 #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 4c86501d7e..66a5a59de2 100644
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.c
@@ -29,19 +29,22 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/emem.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-tcp.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c
index 440f3b095d..87eee4682b 100644
--- a/gtk/conversations_tr.c
+++ b/gtk/conversations_tr.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-tr.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c
index 5ef123b67c..4223b1b952 100644
--- a/gtk/conversations_udpip.c
+++ b/gtk/conversations_udpip.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-udp.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/conversations_usb.c b/gtk/conversations_usb.c
index cabeb5ed83..c9cca1622e 100644
--- a/gtk/conversations_usb.c
+++ b/gtk/conversations_usb.c
@@ -29,16 +29,19 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
+
+#include "../stat_menu.h"
 #include "../register.h"
-#include "conversations_table.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
 
 
 static int
diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c
index b23d2111aa..d5a2ce5fe2 100644
--- a/gtk/conversations_wlan.c
+++ b/gtk/conversations_wlan.c
@@ -29,18 +29,21 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
+
+#include <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-ieee80211.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
+
 
 static int
 wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index 885e06f488..9319fd303f 100644
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -38,55 +38,55 @@
 #include <epan/ipproto.h>
 #include <epan/dissector_filters.h>
 #include <epan/strutil.h>
-
-#include "about_dlg.h"
-#include "capture_dlg.h"
-#include "color_dlg.h"
-#include "filter_dlg.h"
-#include "profile_dlg.h"
-#include "dlg_utils.h"
-#include "capture_file_dlg.h"
-#include "fileset_dlg.h"
-#include "find_dlg.h"
-#include "goto_dlg.h"
-#include "summary_dlg.h"
-#include "prefs_dlg.h"
-#include "packet_win.h"
-#include "print.h"
-#include "follow_tcp.h"
-#include "follow_udp.h"
-#include "follow_ssl.h"
-#include "decode_as_dlg.h"
-#include "help_dlg.h"
-#include "supported_protos_dlg.h"
-#include "proto_dlg.h"
-#include "proto_hier_stats_dlg.h"
-#include "keys.h"
 #include <epan/plugins.h>
 #include <epan/epan_dissect.h>
-#include "stock_icons.h"
-#include "gtkglobals.h"
-#include "register.h"
-#include "recent.h"
+
+#include "../print.h"
+#include "../register.h"
 #include "../ui_util.h"
-#include "main_proto_draw.h"
-#include "conversations_table.h"
-#include "hostlist_table.h"
-#include "simple_dialog.h"
-#include "packet_history.h"
-#include "color_filters.h"
-#include "sctp_stat.h"
-#include "firewall_dlg.h"
-#include "u3.h"
-#include "macros_dlg.h"
-#include "export_object.h"
-
-#include "main.h"
-#include "main_menu.h"
-#include "main_packet_list.h"
-#include "main_toolbar.h"
+#include "../simple_dialog.h"
+#include "../color_filters.h"
 #include "../stat_menu.h"
-#include "gui_stat_menu.h"
+
+#include "gtk/about_dlg.h"
+#include "gtk/capture_dlg.h"
+#include "gtk/color_dlg.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/profile_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/fileset_dlg.h"
+#include "gtk/find_dlg.h"
+#include "gtk/goto_dlg.h"
+#include "gtk/summary_dlg.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/packet_win.h"
+#include "gtk/follow_tcp.h"
+#include "gtk/follow_udp.h"
+#include "gtk/follow_ssl.h"
+#include "gtk/decode_as_dlg.h"
+#include "gtk/help_dlg.h"
+#include "gtk/supported_protos_dlg.h"
+#include "gtk/proto_dlg.h"
+#include "gtk/proto_hier_stats_dlg.h"
+#include "gtk/keys.h"
+#include "gtk/stock_icons.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/recent.h"
+#include "gtk/main_proto_draw.h"
+#include "gtk/conversations_table.h"
+#include "gtk/hostlist_table.h"
+#include "gtk/packet_history.h"
+#include "gtk/sctp_stat.h"
+#include "gtk/firewall_dlg.h"
+#include "gtk/u3.h"
+#include "gtk/macros_dlg.h"
+#include "gtk/export_object.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/main_packet_list.h"
+#include "gtk/main_toolbar.h"
 
 
 typedef struct _menu_item {
diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index bb72d33eb4..538dd23de0 100644
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -46,34 +46,29 @@
 
 #include <epan/epan_dissect.h>
 
-#include "isprint.h"
-
 #include <epan/packet.h>
 #include <epan/charsets.h>
-#include "keys.h"
-
 #include <epan/prefs.h>
-#include "colors.h"
-#include "capture_file_dlg.h"
-#include "packet_win.h"
-#if 0
-#include "dlg_utils.h"
-#endif
-#include "file_dlg.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
-#include "progress_dlg.h"
-#include "font_utils.h"
 
+#include "../isprint.h"
+#include "../alert_box.h"
+#include "../simple_dialog.h"
+#include "../progress_dlg.h"
 #include "../ui_util.h"
-#include "file_util.h"
-#include "webbrowser.h"
-
-#include "main.h"
-#include "main_menu.h"
-#include "main_proto_draw.h"
+#include "wiretap/file_util.h"
+
+#include "gtk/keys.h"
+#include "gtk/colors.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/packet_win.h"
+#include "gtk/file_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/font_utils.h"
+#include "gtk/webbrowser.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/main_proto_draw.h"
 
 #if _WIN32
 #include <gdk/gdkwin32.h>
diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c
index 45ce230415..6b8ab4db0f 100644
--- a/gtk/main_statusbar.c
+++ b/gtk/main_statusbar.c
@@ -39,16 +39,17 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 
-#include "cfile.h"
-#include "file.h"
-#include "capture_opts.h"
-#include "capture_ui_utils.h"
-#include "recent.h"
-#include "main.h"
-#include "main_statusbar.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "expert_comp_dlg.h"
+#include "../cfile.h"
+#include "../file.h"
+#include "../capture_opts.h"
+#include "../capture_ui_utils.h"
+
+#include "gtk/recent.h"
+#include "gtk/main.h"
+#include "gtk/main_statusbar.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/expert_comp_dlg.h"
 
 #include "../image/expert_error.xpm"
 #include "../image/expert_warn.xpm"
diff --git a/gtk/main_toolbar.c b/gtk/main_toolbar.c
index dbb8c7c1a3..b670eb5bc3 100644
--- a/gtk/main_toolbar.c
+++ b/gtk/main_toolbar.c
@@ -33,28 +33,31 @@
 
 #include <gtk/gtk.h>
 
+#include <epan/prefs.h>
+#include <epan/dfilter/dfilter.h>
+
+#include "../color.h"
+#include "../color_filters.h"
+
 #ifdef HAVE_LIBPCAP
-#include "capture_dlg.h"
+#include "gtk/capture_dlg.h"
 #endif /* HAVE_LIBPCAP */
-#include "filter_dlg.h"
-#include "capture_file_dlg.h"
-#include "find_dlg.h"
-#include "goto_dlg.h"
-#include "color.h"
-#include "color_dlg.h"
-#include <epan/prefs.h>
-#include "prefs_dlg.h"
-#include "main.h"
-#include "main_menu.h"
-#include "main_packet_list.h"
-#include "main_toolbar.h"
-#include "help_dlg.h"
-#include "gtkglobals.h"
-#include "stock_icons.h"
-#include "keys.h"
-#include "recent.h"
-#include "packet_history.h"
-#include "color_filters.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/find_dlg.h"
+#include "gtk/goto_dlg.h"
+#include "gtk/color_dlg.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/main_packet_list.h"
+#include "gtk/main_toolbar.h"
+#include "gtk/help_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/stock_icons.h"
+#include "gtk/keys.h"
+#include "gtk/recent.h"
+#include "gtk/packet_history.h"
 
 
 
diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c
index 95ca019027..bd67db649d 100644
--- a/gtk/main_welcome.c
+++ b/gtk/main_welcome.c
@@ -25,9 +25,9 @@
 
 #include <gtk/gtk.h>
 
-#include "gui_utils.h"
-#include "recent.h"
-#include "main_welcome.h"
+#include "gtk/gui_utils.h"
+#include "gtk/recent.h"
+#include "gtk/main_welcome.h"
 
 
 #ifdef SHOW_WELCOME_PAGE