sort #includes by directories

svn path=/trunk/; revision=24968

38 files changed, 457 insertions, 424 deletions

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 01cb0b0ac5..77546c3f33 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -36,25 +36,25 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <glib.h>
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
 #include <epan/tap.h>
-#include "../register.h"
 #include <epan/dissectors/packet-dcerpc.h>
+
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
+#include "../register.h"
 #include "../globals.h"
-#include "filter_dlg.h"
-#include "stock_icons.h"
-#include "service_response_time_table.h"
-#include "gtkglobals.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/gtkglobals.h"
 
 
 /* used to keep track of the statistics for an entire program interface */
diff --git a/gtk/decode_as_ber.c b/gtk/decode_as_ber.c
index 84a6ee16d6..3e5020674d 100644
--- a/gtk/decode_as_ber.c
+++ b/gtk/decode_as_ber.c
@@ -24,23 +24,24 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-#include "decode_as_ber.h"
-
 #include <epan/dissectors/packet-ber.h>
 
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+#include "gtk/decode_as_ber.h"
+
 
 /**************************************************/
 /* Action routines for the "Decode As..." dialog  */
diff --git a/gtk/decode_as_dcerpc.c b/gtk/decode_as_dcerpc.c
index 3309db7392..c571b634b9 100644
--- a/gtk/decode_as_dcerpc.c
+++ b/gtk/decode_as_dcerpc.c
@@ -24,22 +24,23 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-
 #include <epan/dissectors/packet-dcerpc.h>
 
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+
 
 /**************************************************/
 /*                Typedefs & Enums                */
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index fba8914761..4ad026116c 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -25,21 +25,23 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-#include "decode_as_ber.h"
-#include "help_dlg.h"
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+#include "gtk/decode_as_ber.h"
+#include "gtk/help_dlg.h"
 
 #undef DEBUG
 
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 04253a8ed2..bba5451e2a 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -42,19 +42,21 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <gtk/gtk.h>
 #include <ctype.h>
 #include <string.h>
 
-#include "globals.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "proto_dlg.h"
-#include "filter_dlg.h"
-#include "dfilter_expr_dlg.h"
+#include <gtk/gtk.h>
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/proto_dlg.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/dfilter_expr_dlg.h"
+
 
 #define E_DFILTER_EXPR_TREE_KEY			"dfilter_expr_tree"
 #define E_DFILTER_EXPR_CURRENT_VAR_KEY		"dfilter_expr_current_var"
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 003b6dcac3..de881cbd9d 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -25,17 +25,16 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
+#include <stdarg.h>
 
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
-#include "gtkglobals.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "stock_icons.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/stock_icons.h"
 
-#include <string.h>
-#include <stdarg.h>
 
 static void
 dlg_activate (GtkWidget *widget, gpointer ok_button);
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 1aa5dba51c..87dddd8e28 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -29,26 +29,26 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#include <string.h>
+#include <stdio.h>
 
 #include <gtk/gtk.h>
 
-#include "globals.h"
+#include <epan/prefs.h>
 
-#include "gtkglobals.h"
-#include "util.h"
-#include "capture_file_dlg.h"
-#include "file.h"
-#include "simple_dialog.h"
-#include "drag_and_drop.h"
-#include "main.h"
-#include "main_menu.h"
+#include "../globals.h"
+#include "../util.h"
+#include "../file.h"
+#include "../simple_dialog.h"
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "../capture.h"
 #endif
-#include <epan/prefs.h>
 
-#include <string.h>
-#include <stdio.h>
+#include "gtk/gtkglobals.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/drag_and_drop.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
 
 
 enum { DND_TARGET_STRING, DND_TARGET_ROOTWIN, DND_TARGET_URL };
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index 80b926587d..a5641d7389 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -29,22 +29,26 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-
 #include <string.h>
+
 #include <gtk/gtk.h>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+
 #include "../register.h"
 #include "../simple_dialog.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
 #include "../globals.h"
-#include "expert_comp_table.h"
 #include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include <epan/stat_cmd_args.h>
-#include "help_dlg.h"
-#include "expert_comp_dlg.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/expert_comp_table.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/help_dlg.h"
+#include "gtk/expert_comp_dlg.h"
+
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _expert_comp_dlg_t {
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 536ff2254d..4992954379 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -33,21 +33,25 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+
 #include <gtk/gtk.h>
+
 #include "epan/packet_info.h"
-#include "expert_comp_table.h"
+#include <epan/expert.h>
+#include <epan/emem.h>
 
-#include "simple_dialog.h"
-#include "globals.h"
+#include "../simple_dialog.h"
+#include "../globals.h"
+#include "../color.h"
+
+#include "gtk/expert_comp_table.h"
 #include "gtk/find_dlg.h"
-#include "color.h"
 #include "gtk/color_dlg.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "webbrowser.h"
-#include <epan/expert.h>
-#include <epan/emem.h>
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/webbrowser.h"
+
 
 #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
 
diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index 683768581b..4a247be7dd 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -27,38 +27,39 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <epan/packet.h>
-#include <epan/expert.h>
-#include <epan/emem.h>
-#include <epan/tap.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+
 #include <gtk/gtk.h>
+
+#include <epan/packet.h>
+#include <epan/expert.h>
+#include <epan/emem.h>
+#include <epan/tap.h>
 #include "epan/packet_info.h"
+#include <epan/stat_cmd_args.h>
+#include <epan/prefs.h>
+
+#include "../simple_dialog.h"
+#include "../globals.h"
+#include "../color.h"
+#include "../stat_menu.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
-#include "simple_dialog.h"
-#include "globals.h"
+
 #include "gtk/find_dlg.h"
-#include "color.h"
 #include "gtk/color_dlg.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "dlg_utils.h"
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "tap_dfilter_dlg.h"
-#include <epan/stat_cmd_args.h>
-
-#include <epan/prefs.h>
-#include "colors.h"
-#include "main_proto_draw.h"
-#include "help_dlg.h"
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/tap_dfilter_dlg.h"
+#include "gtk/colors.h"
+#include "gtk/main_proto_draw.h"
+#include "gtk/help_dlg.h"
 
 
 static const value_string expert_severity_om_vals[] = {
diff --git a/gtk/export_object.c b/gtk/export_object.c
index ecad23307d..851e7b3e1c 100644
--- a/gtk/export_object.c
+++ b/gtk/export_object.c
@@ -28,33 +28,32 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #if GTK_CHECK_VERSION(2,4,0)
 
-#include <alert_box.h>
-#include <simple_dialog.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <epan/packet_info.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
+
+#include <../alert_box.h>
+#include <../simple_dialog.h>
+#include <wiretap/file_util.h>
+
 #include <gtk/dlg_utils.h>
 #include <gtk/file_dlg.h>
 #include <gtk/gui_utils.h>
 #include <gtk/help_dlg.h>
 #include <gtk/main.h>
-#include <wiretap/file_util.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "export_object.h"
+#include "gtk/export_object.h"
 
 enum {
 	EO_PKT_NUM_COLUMN,
diff --git a/gtk/export_object_http.c b/gtk/export_object_http.c
index ebfc58cf79..d3f07427b2 100644
--- a/gtk/export_object_http.c
+++ b/gtk/export_object_http.c
@@ -36,11 +36,11 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
 #include <epan/dissectors/packet-http.h>
-
 #include <epan/emem.h>
 #include <epan/tap.h>
 
-#include "export_object.h"
+#include "gtk/export_object.h"
+
 
 static int
 eo_http_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index d6cd2b441f..1f548ddca4 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -37,23 +37,24 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-scsi.h>
 #include <epan/dissectors/packet-fc.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 "gtkglobals.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"
+#include "gtk/gtkglobals.h"
 
 
 /* used to keep track of the statistics for an entire program interface */
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index a346da1fde..2b4c0718cc 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -25,18 +25,18 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
+#include <errno.h>
 
 #include <gtk/gtk.h>
 
 #include <epan/filesystem.h>
 
-#include "gtkglobals.h"
-#include "gui_utils.h"
-#include "file_dlg.h"
-#include "keys.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/file_dlg.h"
+#include "gtk/keys.h"
 
-#include <string.h>
-#include <errno.h>
 
 static gchar *last_open_dir = NULL;
 static gboolean updated_last_open_dir = FALSE;
diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 979de59c81..872b270ff1 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -34,22 +34,18 @@
 
 #include <gtk/gtk.h>
 
-#include "globals.h"
-
-
-#include "simple_dialog.h"
-
-#include "gui_utils.h"
-#include "dlg_utils.h"
-
-#include "main.h"
-#include "main_menu.h"
-#include "help_dlg.h"
-
 #include <epan/filesystem.h>
 
-#include "fileset.h"
-#include "fileset_dlg.h"
+#include "../globals.h"
+#include "../simple_dialog.h"
+#include "../fileset.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
+#include "gtk/help_dlg.h"
+#include "gtk/fileset_dlg.h"
 
 
 
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index af75bb0f4e..2b8230352c 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -31,20 +31,22 @@
 #include <gtk/gtk.h>
 
 #include <epan/filesystem.h>
-
-#include "filters.h"
-#include "main.h"
-#include "main_statusbar.h"
-#include "filter_dlg.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 <epan/prefs.h>
 
+#include "../filters.h"
+#include "../simple_dialog.h"
+
+#include "gtk/main.h"
+#include "gtk/main_statusbar.h"
+#include "gtk/filter_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/gtkglobals.h"
+#include "gtk/help_dlg.h"
+
+
 #define E_FILT_DIALOG_PTR_KEY       "filter_dialog_ptr"
 #define E_FILT_BUTTON_PTR_KEY       "filter_button_ptr"
 #define E_FILT_PARENT_FILTER_TE_KEY "filter_parent_filter_te"
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index fa9db5576d..fbe448ade1 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -34,19 +34,21 @@
 #include <epan/proto.h>
 #include <epan/dfilter/dfilter.h>
 #include <epan/strutil.h>
-#include "globals.h"
-
-#include "gui_utils.h"
-#include "find_dlg.h"
-#include "filter_dlg.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "stock_icons.h"
 #include <epan/prefs.h>
-#include "prefs_dlg.h"
-#include "keys.h"
-#include "help_dlg.h"
+
+#include "../globals.h"
+#include "../alert_box.h"
+#include "../simple_dialog.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/find_dlg.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/stock_icons.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/keys.h"
+#include "gtk/help_dlg.h"
+
 
 /* Capture callback data keys */
 #define E_FIND_FILT_KEY       "find_filter_te"
diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c
index c485e075d9..3b3c89a717 100644
--- a/gtk/firewall_dlg.c
+++ b/gtk/firewall_dlg.c
@@ -34,9 +34,9 @@
 
 /* Copied from ssl-dlg.c */
 
-#include "config.h"
-
-#include <gtk/gtk.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -51,26 +51,30 @@
 
 #include <ctype.h>
 
-#include <gtk/main.h>
-#include <gtk/dlg_utils.h>
-#include <gtk/file_dlg.h>
-#include <gtk/keys.h>
-#include <globals.h>
-#include <alert_box.h>
-#include <simple_dialog.h>
-#include <epan/dissectors/packet-ipv6.h>
+#include <gtk/gtk.h>
+
 #include <epan/prefs.h>
+#include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/charsets.h>
-#include <util.h>
-#include <gtk/gui_utils.h>
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/ipproto.h>
-#include <gtk/font_utils.h>
+#include <epan/dissectors/packet-ipv6.h>
+
+#include <../globals.h>
+#include <../alert_box.h>
+#include <../simple_dialog.h>
+#include <../util.h>
 #include <wiretap/file_util.h>
 
-#include "firewall_dlg.h"
+#include <gtk/main.h>
+#include <gtk/dlg_utils.h>
+#include <gtk/file_dlg.h>
+#include <gtk/keys.h>
+#include <gtk/gui_utils.h>
+#include <gtk/font_utils.h>
+#include "gtk/firewall_dlg.h"
 
 #define MAX_RULE_LEN 200
 
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 731d7951fb..04f8c9d69b 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -27,30 +27,33 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
+#include <string.h>
 
-#include "register.h"
-
-#include "globals.h"
-#include "epan/filesystem.h"
+#include <gtk/gtk.h>
 
-#include "graph_analysis.h"
+#include <epan/epan.h>
+#include <epan/packet.h>
+#include <epan/filesystem.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-
-#include "simple_dialog.h"
-
 #include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
-
-#include <string.h>
 #include <epan/strutil.h>
 
+#include "../register.h"
+#include "../globals.h"
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
+
+#include "gtk/graph_analysis.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+
+
+
 #define DISPLAYED 0
 #define ALL 1
 #define GENERAL 0
diff --git a/gtk/follow_ssl.c b/gtk/follow_ssl.c
index 0bea31d8ec..256e564a74 100644
--- a/gtk/follow_ssl.c
+++ b/gtk/follow_ssl.c
@@ -23,10 +23,9 @@
  * USA.
  */
 
-#include "config.h"
-
-#include <gtk/gtk.h>
-
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 
@@ -37,37 +36,40 @@
 
 #include <ctype.h>
 
-#include <color.h>
-#include <gtk/colors.h>
-#include <gtk/main.h>
+#include <gtk/gtk.h>
+
 #include <epan/follow.h>
-#include <gtk/dlg_utils.h>
-#include <gtk/file_dlg.h>
-#include <gtk/keys.h>
-#include <globals.h>
-#include <alert_box.h>
-#include <simple_dialog.h>
 #include <epan/dissectors/packet-ipv6.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
-#include <util.h>
-#include <gtk/gui_utils.h>
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/ipproto.h>
-#include <gtk/font_utils.h>
-#include <wiretap/file_util.h>
 #include <epan/tap.h>
 
+#include <../color.h>
+#include <../globals.h>
+#include <../alert_box.h>
+#include <../simple_dialog.h>
+#include <../util.h>
+#include <wiretap/file_util.h>
+
+#include <gtk/colors.h>
+#include <gtk/main.h>
+#include <gtk/dlg_utils.h>
+#include <gtk/file_dlg.h>
+#include <gtk/keys.h>
+#include <gtk/gui_utils.h>
+#include <gtk/font_utils.h>
+#include "gtk/follow_ssl.h"
+#include "gtk/follow_stream.h"
+
 #ifdef SSL_PLUGIN
 #include "packet-ssl-utils.h"
 #else
 #include <epan/dissectors/packet-ssl-utils.h>
 #endif
 
-#include "follow_ssl.h"
-
-#include "follow_stream.h"
 
 typedef struct {
     gboolean is_server;
diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
index 75fea03b68..074ea8c5e6 100644
--- a/gtk/follow_stream.c
+++ b/gtk/follow_stream.c
@@ -27,18 +27,26 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <ctype.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
 
-#include <alert_box.h>
-#include <isprint.h>
-#include <print.h>
 #include <epan/addr_resolv.h>
 #include <epan/follow.h>
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
+#include <epan/charsets.h>
+
+#include <../alert_box.h>
+#include <../isprint.h>
+#include <../print.h>
+#include <../simple_dialog.h>
+#include <wiretap/file_util.h>
+
 #include <gtk/colors.h>
 #include <gtk/stock_icons.h>
 #include <gtk/dlg_utils.h>
@@ -47,16 +55,9 @@
 #include <gtk/file_dlg.h>
 #include <gtk/gui_utils.h>
 #include <gtk/help_dlg.h>
-#include <simple_dialog.h>
-#include <wiretap/file_util.h>
-#include <epan/charsets.h>
-
-#include "main.h"
-#include "print_mswin.h"
+#include "gtk/main.h"
+#include "gtk/print_mswin.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 /* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
  * earlier).  It defines the new wrap behavior (unknown in earlier versions)
diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index 96412518c6..c75b5e08e6 100644
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -27,48 +27,48 @@
 # include "config.h"
 #endif
 
-#include <gtk/gtk.h>
-
 #include <stdio.h>
 #include <string.h>
 
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #include <ctype.h>
 
-#include "isprint.h"
+#include <gtk/gtk.h>
 
-#include "file_util.h"
-#include "color.h"
-#include "colors.h"
-#include "file.h"
-#include "follow_tcp.h"
 #include <epan/follow.h>
-#include "dlg_utils.h"
-#include "file_dlg.h"
-#include "keys.h"
-#include "globals.h"
-#include "main.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
 #include <epan/dissectors/packet-ipv6.h>
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include <epan/charsets.h>
-#include "tempfile.h"
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/ipproto.h>
-#include "print_mswin.h"
-#include "font_utils.h"
-#include "help_dlg.h"
 #include <epan/charsets.h>
 
-#include "follow_stream.h"
+#include "../isprint.h"
+#include "../color.h"
+#include "../file.h"
+#include "../globals.h"
+#include "../alert_box.h"
+#include "../simple_dialog.h"
+#include "../tempfile.h"
+#include "wiretap/file_util.h"
+
+#include "gtk/colors.h"
+#include "gtk/follow_tcp.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/file_dlg.h"
+#include "gtk/keys.h"
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/print_mswin.h"
+#include "gtk/font_utils.h"
+#include "gtk/help_dlg.h"
+#include "gtk/follow_stream.h"
+
 
 /* With MSVC and a libwireshark.dll, we need a special declaration. */
 WS_VAR_IMPORT FILE *data_out_file;
diff --git a/gtk/follow_udp.c b/gtk/follow_udp.c
index 2ef0d3717a..2a9525f3a8 100644
--- a/gtk/follow_udp.c
+++ b/gtk/follow_udp.c
@@ -23,25 +23,27 @@
  * USA.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <string.h>
 
 #include <gtk/gtk.h>
 
-#include <string.h>
-
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
 #include <epan/follow.h>
 #include <epan/ipproto.h>
 #include <epan/strutil.h>
 #include <epan/tap.h>
-#include "follow_stream.h"
-#include <globals.h>
+
+#include <../globals.h>
+#include <../simple_dialog.h>
+
+#include "gtk/follow_stream.h"
 #include <gtk/keys.h>
 #include <gtk/main.h>
-#include <simple_dialog.h>
-
-#include "follow_udp.h"
+#include "gtk/follow_udp.h"
 
 
 static int
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 0aadcc4d93..4130979e33 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -25,13 +25,14 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <gtk/gtk.h>
+
 #include <epan/packet.h>
+#include <epan/prefs.h>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -39,18 +40,15 @@
 #include <epan/unicode-utils.h>
 #endif
 
-#include "main.h"
-#include "recent.h"
-#include <epan/prefs.h>
-
-#include "gtkglobals.h"
-
-#include "font_utils.h"
-#include "simple_dialog.h"
+#include "../simple_dialog.h"
 
-#include "main_packet_list.h"
-#include "main_proto_draw.h"
-#include "follow_tcp.h"
+#include "gtk/main.h"
+#include "gtk/recent.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/font_utils.h"
+#include "gtk/main_packet_list.h"
+#include "gtk/main_proto_draw.h"
+#include "gtk/follow_tcp.h"
 
 
 
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index b80e23b123..efc5655aaa 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -38,32 +38,32 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-
 #include <string.h>
 
 #include <gtk/gtk.h>
 
+#include <epan/prefs.h>
+#include <epan/funnel.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 "../stat_menu.h"
-#include "tap_dfilter_dlg.h"
-#include "font_utils.h"
-#include "gui_stat_menu.h"
-#include <epan/prefs.h>
-#include "column_prefs.h"
-#include "prefs_dlg.h"
-#include "file.h"
-#include "main.h"
-#include "webbrowser.h"
+#include "../file.h"
 
-#include "gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/tap_dfilter_dlg.h"
+#include "gtk/font_utils.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/column_prefs.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/main.h"
+#include "gtk/webbrowser.h"
+#include "gtk/gtkglobals.h"
 
-#include <epan/funnel.h>
 
 struct _funnel_text_window_t {
 	GtkWidget* win;
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 06eb498b7f..56b5710575 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -30,13 +30,15 @@
 #include <gtk/gtk.h>
 
 #include <epan/proto.h>
-#include "globals.h"
 
-#include "goto_dlg.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "help_dlg.h"
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/goto_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/help_dlg.h"
+
 
 /* Capture callback data keys */
 #define E_GOTO_FNUMBER_KEY     "goto_fnumber_te"
diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index a4db0b895f..a6d0923faa 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -31,41 +31,32 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
-#include <epan/epan_dissect.h>
-
-#include "util.h"
-#include <epan/tap.h>
-#include "register.h"
-#include <epan/dissectors/packet-rtp.h>
-#include <epan/addr_resolv.h>
-
-/* in /gtk ... */
-#include <gtk/gtk.h>
-#include <glib-object.h>
-
-#include <gdk/gdkkeysyms.h>
-#include "gtkglobals.h"
-
-#if 0
-#include "dlg_utils.h"
-#endif
-#include "file_dlg.h"
-#include "gui_utils.h"
-#include "main.h"
-#include "../color.h"
-#include "epan/filesystem.h"
-#include "file_util.h"
-
 #include <string.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#include "simple_dialog.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <epan/epan_dissect.h>
+#include <epan/tap.h>
+#include <epan/dissectors/packet-rtp.h>
+#include <epan/addr_resolv.h>
+#include "epan/filesystem.h"
 
-#include "graph_analysis.h"
+#include "../util.h"
+#include "../register.h"
+#include "../color.h"
+#include "../simple_dialog.h"
+#include "wiretap/file_util.h"
+
+#include "gtk/gtkglobals.h"
+#include "gtk/file_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/main.h"
+#include "gtk/graph_analysis.h"
 
 
 /****************************************************************************/
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 23cd5e5c1b..77cbb8b1d9 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -33,27 +33,30 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <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 "../register.h"
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_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/gsm_map_stat.c b/gtk/gsm_map_stat.c
index c2a2f43ae9..572710de3a 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -33,29 +33,33 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "epan/value_string.h"
+#include <epan/epan.h>
+#include <epan/packet.h>
+#include <epan/packet_info.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 "gui_utils.h"
 #include <epan/tap.h>
+#include <epan/asn1.h>
+#include <epan/dissectors/packet-gsm_map.h>
+
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_dlg.h"
 
-#include <epan/asn1.h>
-#include <epan/dissectors/packet-gsm_map.h>
-#include "gsm_map_stat.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/gsm_map_stat.h"
+
+#include "image/clist_ascend.xpm"
+#include "image/clist_descend.xpm"
+
 
 typedef struct column_arrows {
     GtkWidget		*table;
diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index e46627e207..8553672590 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.c
@@ -37,23 +37,26 @@
 
 #include <gtk/gtk.h>
 
-#include <wtap.h>
+#include <wiretap/wtap.h>
 
-#include "epan/packet_info.h"
-#include "epan/epan.h"
-#include "epan/value_string.h"
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "globals.h"
-#include "file.h"
-#include "summary.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
+#include <epan/epan.h>
+#include <epan/packet.h>
+#include <epan/packet_info.h>
+#include <epan/value_string.h>
 #include <epan/tap.h>
-
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
-#include "gsm_map_stat.h"
+
+#include "../stat_menu.h"
+#include "../globals.h"
+#include "../file.h"
+#include "../summary.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gsm_map_stat.h"
+
 
 #define SUM_STR_MAX 1024
 
diff --git a/gtk/gtkvumeter.c b/gtk/gtkvumeter.c
index 8c01a3f86f..75426c678c 100644
--- a/gtk/gtkvumeter.c
+++ b/gtk/gtkvumeter.c
@@ -15,7 +15,7 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
-#include "gtkvumeter.h"
+#include "gtk/gtkvumeter.h"
 
 
 #define MIN_DYNAMIC_SIDE    40
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 3892dc17e7..da808c3afb 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -25,28 +25,29 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
 
-#include <string.h>
-
-#include "globals.h"
-#include "gui_prefs.h"
-#include "gtkglobals.h"
-#include "help_dlg.h"
-#include "supported_protos_dlg.h"
 #include <epan/prefs.h>
-#include "prefs_dlg.h"
-#include "gui_utils.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "main.h"
-#include "main_packet_list.h"
-#include "main_proto_draw.h"
-#include "main_toolbar.h"
-#include "font_utils.h"
-#include "recent.h"
-#include "webbrowser.h"
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/gui_prefs.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/help_dlg.h"
+#include "gtk/supported_protos_dlg.h"
+#include "gtk/prefs_dlg.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/main.h"
+#include "gtk/main_packet_list.h"
+#include "gtk/main_proto_draw.h"
+#include "gtk/main_toolbar.h"
+#include "gtk/font_utils.h"
+#include "gtk/recent.h"
+#include "gtk/webbrowser.h"
 
 
 static gint fetch_enum_value(gpointer control, const enum_val_t *enumvals);
diff --git a/gtk/gui_stat_util.c b/gtk/gui_stat_util.c
index 4ff97ae17e..d0819b87dc 100644
--- a/gtk/gui_stat_util.c
+++ b/gtk/gui_stat_util.c
@@ -32,14 +32,17 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "gui_stat_util.h"
+
 #include "../simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"
 
+#include "gtk/gui_stat_util.h"
+
+
 /* insert a string into a GTK_TABLE at column x and row y*/
 #if 0
 /* Statistic table */
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 0c669c231d..3db465eebf 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -33,23 +33,18 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "file_util.h"
-#include "gtkglobals.h"
-#include "gui_utils.h"
 #include <epan/prefs.h>
 #include "epan/epan.h"
+
 #include "../ui_util.h"
-#include "recent.h"
+#include "wiretap/file_util.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/recent.h"
 
 #include "image/wsicon16.xpm"
 
-/* XXX - remove this later again, when dlg_xx function cleanup done */
-#include "dlg_utils.h"
-
 
 #define WINDOW_GEOM_KEY "window_geom"
 
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 9a8fe6dbb5..8ca1a5504a 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -39,18 +39,19 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-
 #include <epan/tap.h>
-#include "../register.h"
 #include <epan/dissectors/packet-h225.h>
-#include "gui_stat_util.h"
+
+#include "../register.h"
 #include "../simple_dialog.h"
-#include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "tap_dfilter_dlg.h"
-#include "gui_utils.h"
+
+#include "gtk/gui_stat_util.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/tap_dfilter_dlg.h"
+#include "gtk/gui_utils.h"
 
 
 static void gtk_h225counter_init(const char *optarg, void *userdata);
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index a09a64346a..172c33699f 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -39,19 +39,20 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-
 #include <epan/tap.h>
-#include "../register.h"
 #include <epan/dissectors/packet-h225.h>
+
+#include "../register.h"
 #include "../timestats.h"
-#include "gui_stat_util.h"
 #include "../simple_dialog.h"
-#include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "tap_dfilter_dlg.h"
-#include "gui_utils.h"
+
+#include "gtk/gui_stat_util.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/tap_dfilter_dlg.h"
+#include "gtk/gui_utils.h"
 
 
 static void gtk_h225rassrt_init(const char *optarg, void *userdata);
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index d92edbcba0..a903792763 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -26,22 +26,24 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <gtk/gtk.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 
+#include <gtk/gtk.h>
+
 #include "epan/filesystem.h"
-#include "help_dlg.h"
-#include "text_page.h"
 #include <epan/prefs.h>
-#include "gtkglobals.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "simple_dialog.h"
-#include "webbrowser.h"
-#include "file_util.h"
+
+#include "../simple_dialog.h"
+#include "wiretap/file_util.h"
+
+#include "gtk/help_dlg.h"
+#include "gtk/text_page.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/webbrowser.h"
 
 #ifdef HHC_DIR
 #include <windows.h>
diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c
index ced454a3f1..e9f0d588cd 100644
--- a/gtk/hostlist_eth.c
+++ b/gtk/hostlist_eth.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 "hostlist_table.h"
 #include <epan/dissectors/packet-eth.h>
 
+#include "../stat_menu.h"
+#include "../register.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/hostlist_table.h"
+
 
 static int
 eth_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)