5 files changed, 14 insertions, 15 deletions
diff --git a/file.c b/file.c
index b85931e9a9..bd809d54b7 100644
--- a/file.c
+++ b/file.c
@@ -73,9 +73,6 @@
 #include <epan/column-utils.h>
 #include <epan/strutil.h>
 
-#ifdef NEW_PACKET_LIST
-#include "gtk/new_packet_list.h"
-#endif
 
 #ifdef HAVE_LIBPCAP
 gboolean auto_scroll_live;
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index a89bc149ee..22a722d8a7 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -24,12 +24,12 @@
  * USA.
  */
 
-#ifdef NEW_PACKET_LIST
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifdef NEW_PACKET_LIST
+
 #ifdef HAVE_STRING_H
 #include "string.h"
 #endif
@@ -37,6 +37,8 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
+#include "../ui_util.h"
+
 #include "gui_utils.h"
 #include "packet_list_store.h"
 #include "epan/column_info.h"
diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h
index 7f748a9315..c7978ffe71 100644
--- a/gtk/new_packet_list.h
+++ b/gtk/new_packet_list.h
@@ -28,15 +28,10 @@
 #ifdef NEW_PACKET_LIST
 
 #include <gtk/gtk.h>
-
-GtkWidget *new_packet_list_create(void);
 guint new_packet_list_append(column_info cinfo, gpointer fdata);
-void new_packet_list_freeze(void);
-void new_packet_list_thaw(void);
-void new_packet_list_next(void);
-void new_packet_list_prev(void);
-void new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
 gpointer new_packet_list_get_row_data(gint row);
+GtkWidget *new_packet_list_create(void);
+void new_packet_list_resize_columns_cb(GtkWidget *widget _U_, gpointer data _U_);
 
 #endif /* NEW_PACKET_LIST */
 
diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c
index 0263348d26..4685e6acbb 100644
--- a/gtk/packet_list_store.c
+++ b/gtk/packet_list_store.c
@@ -26,12 +26,13 @@
 
 /* This code is based on the GTK+ Tree View tutorial at http://scentric.net */
 
-#ifdef NEW_PACKET_LIST
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#ifdef NEW_PACKET_LIST
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/ui_util.h b/ui_util.h
index 5509dd3110..93b46cae56 100644
--- a/ui_util.h
+++ b/ui_util.h
@@ -54,8 +54,12 @@ extern void pipe_input_set_handler(gint source, gpointer user_data, int *child_p
 
 /* packet_list.c */
 
-#ifndef NEW_PACKET_LIST
-
+#ifdef NEW_PACKET_LIST
+void new_packet_list_freeze(void);
+void new_packet_list_thaw(void);
+void new_packet_list_next(void);
+void new_packet_list_prev(void);
+#else
 /* packet list related functions */
 void packet_list_clear(void);
 void packet_list_freeze(void);