sort #includes by directories
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Apr 2008 00:55:59 +0000 (00:55 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Apr 2008 00:55:59 +0000 (00:55 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24967 f5534014-38df-0310-8fa8-9805f1628bb7

41 files changed:
gtk/about_dlg.c
gtk/afp_stat.c
gtk/airpcap_dlg.c
gtk/airpcap_gui_utils.c
gtk/ansi_a_stat.c
gtk/ansi_map_stat.c
gtk/bootp_stat.c
gtk/camel_counter.c
gtk/camel_srt.c
gtk/capture_dlg.c
gtk/capture_file_dlg.c
gtk/capture_if_details_dlg.c
gtk/capture_if_dlg.c
gtk/capture_info_dlg.c
gtk/capture_prefs.c
gtk/cfilter_combo_utils.c
gtk/color_dlg.c
gtk/color_edit_dlg.c
gtk/color_utils.c
gtk/colors.c
gtk/column_prefs.c
gtk/conversations_eth.c
gtk/conversations_fc.c
gtk/conversations_fddi.c
gtk/conversations_ip.c
gtk/conversations_ipx.c
gtk/conversations_jxta.c
gtk/conversations_ncp.c
gtk/conversations_rsvp.c
gtk/conversations_sctp.c
gtk/conversations_table.c
gtk/conversations_tcpip.c
gtk/conversations_tr.c
gtk/conversations_udpip.c
gtk/conversations_usb.c
gtk/conversations_wlan.c
gtk/main_menu.c
gtk/main_proto_draw.c
gtk/main_statusbar.c
gtk/main_toolbar.c
gtk/main_welcome.c

index ac12e0f8d7d1adabdc866d92528df60b8594c736..df104d421a396d7741c5ce875188af59471fe72a 100644 (file)
 #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);
 
index f828112d4374a63791bfde1fa5a739ba4c0a9548..8eb492eebcb471ca57a2a7c7d1ff7ef9c3dc6711 100644 (file)
 #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 */
index c4a090fbfd9b79f839d56fd13c1511e9d88e9342..41b055054878d7f0ae38c151226d48e7ab94b858 100644 (file)
@@ -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>
 
 
 #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;
index 198d1a80de8c474e0be7f41bf719cb8bbf5d85d7..12f6a8658d1349cef81857a72ea228fe86d43ff8 100644 (file)
 #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;
index b5bc10dca8729529d0a559eaa527039965da975e..9d528a63458ddf078186219082ff53b7003e6755 100644 (file)
 #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 {
index 1b324bd5690bae30fad15e6e5b778dc9e3aeae89..c0b7b718dda16dbd1de6ba1a1b1a977b306c22fa 100644 (file)
 #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 {
index 4d9fcb328d2100bed26f63ecfbdbeefda6649e9c..88b97442dd7c662577d1fc19412af87d6be13b5b 100644 (file)
 
 #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;
 
index de204fbc5d754070ba786bdf7c1b4dbce3ab1f81..e8980b71113624ade79f66bbe12ce89010ec7343 100644 (file)
 #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,
index 376b3719e28fcc05834e2cdee00f077fa3f3d9b3..9db019f054818c00c0ede9d70d1af93737b26054 100644 (file)
 #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 {
index 0f17aec1e3e9c9f208c4e9c52d1a1c8fbe72e842..09d7f30f32e654ecfbad2aeaa89b89d385cedc6b 100644 (file)
 #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>
index fd7b61d1e5fa5dfcb95db3b81b08e6a5e792829e..066485a412bae1186c36b0c9ede0fe2ac065e46b 100644 (file)
 #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);
index ff75d56f10de36b27095145859397d19622b8020..fade0494f609f6c5485c319d02d5ccfb79e96e7c 100644 (file)
 
 #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
 
 
index 471d0f891d30b2f0f051a35a4a2c6e2f2e2ede70..dc546e2550ed150ce5e283b6fc8dd90c1ddf288b 100644 (file)
 
 #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"
index fbe792a191be6eae9a9ecb135e755189742631d4..6af39011c780dff68b6fe291ff694a8175c93257 100644 (file)
 # 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>
index 020e6ead5ac5ffddc957ac66e81e561bf1d119ab..285d73c83da7fbc39a458690534bfbb1ffbf3941 100644 (file)
 #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"
index b0c1ac4a7488a87b077abad32e2519ed95e4e9c5..b71123b391056376c5edd030ad890bcbeb845160 100644 (file)
 #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;
index bbfa7ec7ee250c793e399904128da085cf9ef9d2..753e059559adf5f123303dd88cba18e73bd2f55c 100644 (file)
 # 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
index 64f3a67e0e9124cc958e445a69448318760bf842..f1e9518e7936c40ca6ecafd97ca705d7039ea74e 100644 (file)
 #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
index 3c6f008f41d954f77afb2a884682027a9d340198..cee6d8a95554bf6d63a339636c722d534983d8ca 100644 (file)
@@ -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
index 872a16aae0ae1c3906814b7c0814a159e4db4151..4793b47a5624fa87cd5959b6be7673a1a3ed528b 100644 (file)
 
 #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;
index c40af5571d503ad2cdc56545f2324639f585bbfa..31a506c84494c377642cb6ffc83bc7438d57b7a4 100644 (file)
 
 #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;
index d25c5e2994a61481c21d1e5311d55f3cbada7b4b..af0a5c8b3e05245beacab9569483884fd8f24772 100644 (file)
 # 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)
index cf34e91ba98fcae2c3067091d8f9b4b8517baf5b..2903343fdd612ea11293731c90cf37022acf860d 100644 (file)
 #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)
index 0f95870b7dd9b1c96fa7e1927a3adaa90d6a6ec8..e7eddf861ef66f328d43b81bb0498167c9fefe43 100644 (file)
 #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)
index 68454f3c37943e5bcc4b55d9f1a361f258eb80fc..3a6f79860ca9ac28de81f7ff98eeaceaca3f634b 100644 (file)
 #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)
index 53f288cb0917242b20e8d54bc89a89fcf300f58d..1f5b01930f20a005b8d61f546c4aa6aeb8005534 100644 (file)
 #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)
index a6ac37c818c848630579947c9a480191cbcff1a7..83f91aefadbc92afa4cad1ad4b2229403b11f24d 100644 (file)
 #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)
index d0bd37ea7377c7f046d2d45f8fae68f3f7cdcf15..b72899b50575a28d0303a8a2372ced6b4e67e987 100644 (file)
 #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)
index 70503b50c076e6ef63b83639335f17e1166e6d11..ec65735bd8aa59d6a0ecdfd9db85a836c30e0159 100644 (file)
 #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)
index 87fc13468fb6412924bd88bf7c992eb54ec03771..4f0cd0a98309461189876fb8ff1219eadd49da3d 100644 (file)
 #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)
index 1b3232f4775f82fc7865294f7b173702309d7227..2a6bcce101a6ec6d80f9484f4a3d98098c485a52 100644 (file)
 #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))
index 4c86501d7e76b4dca2b1d72155f1e6cfc490c658..66a5a59de2e81c88a3d03d39ce06ad5a29816d26 100644 (file)
 #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)
index 440f3b095df41b368d1940d014b851f6545116c4..87eee4682bd6e69385a9cabb7951b667233bb2d1 100644 (file)
 #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)
index 5ef123b67cf1d07c8778d666a29b148dd5501005..4223b1b9527a59736c5c2e17b2b66a4ec7b0b738 100644 (file)
 #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)
index cabeb5ed83a65ca411577c90b6fab14e66f407df..c9cca1622e241349ed165313dde47e590969fd8c 100644 (file)
 #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
index b23d2111aa4681abdceb1bf26ba67ec4291800ac..d5a2ce5fe2d343ba1bf4c5abd5bc926eee186554 100644 (file)
 #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)
index 885e06f488a2ed9f56eca56e5ad5a475b2673461..9319fd303fa8481a5f478ecc1cccdf6b3dd1bf1c 100644 (file)
 #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 {
index bb72d33eb466e0e2615c420176f409963984cd19..538dd23de004a1ffea10768b76981757bb48d631 100644 (file)
 
 #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>
index 45ce23041525d6b12af2cf910d684ca9c7ef5be4..6b8ab4db0fcbde4081b6ac1f30c10366fbc1248c 100644 (file)
 #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"
index dbb8c7c1a34b40916221903652c8a02fb28ea03a..b670eb5bc36a077621b4ea1e7f424d07888b5e95 100644 (file)
 
 #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"
 
 
 
index 95ca019027580ee3cc09575166e8d1726be9668f..bd67db649d5e6f334743c8186dcd9ecb28deb009 100644 (file)
@@ -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