4 files changed, 1 insertions, 9 deletions
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 0c430b71bd..42537fbe21 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 
 #include <epan/packet.h>
-#include <epan/ws_strsplit.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c
index 7f798ddac0..2f3d9e938f 100644
--- a/gtk/uat_gui.c
+++ b/gtk/uat_gui.c
@@ -843,11 +843,9 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent* e _U_, gpointer u) {
 	return TRUE;
 }
 
-#if (GLIB_MAJOR_VERSION >= 2)
 static void uat_help_cb(GtkWidget* w _U_, gpointer u) {
 	help_topic_html(ep_strdup_printf("%s.html",((uat_t*)u)->help));
 }
-#endif
 
 static GtkWidget* uat_window(void* u) {
 	uat_t* uat = u;
@@ -927,18 +925,15 @@ static GtkWidget* uat_window(void* u) {
 	gtk_tree_selection_set_mode(rep->selection, GTK_SELECTION_SINGLE);
 #endif
 
-#if (GLIB_MAJOR_VERSION >= 2)
 	if(uat->help) {
 		GtkWidget* help_btn;
 		rep->bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL);
 		help_btn = OBJECT_GET_DATA(rep->bbox,GTK_STOCK_HELP);
 		SIGNAL_CONNECT(help_btn, "clicked", uat_help_cb, uat);
 	} else {
-#endif
+
 		rep->bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL);
-#if (GLIB_MAJOR_VERSION >= 2)
 	}	
-#endif
 
 	move_hbox = gtk_vbutton_box_new();
 	gtk_box_pack_start(GTK_BOX(vbox), move_hbox, TRUE, FALSE, 0);
diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index c049d6f633..6c63e95755 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -66,7 +66,6 @@
 #include <plugins/unistim/packet-unistim.h>
 #include <epan/conversation.h>
 #include <epan/rtp_pt.h>
-#include <epan/ws_strsplit.h>
 
 #include "alert_box.h"
 #include "simple_dialog.h"
diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c
index bbcfd4f4df..0aa6e0c974 100644
--- a/gtk/webbrowser.c
+++ b/gtk/webbrowser.c
@@ -35,7 +35,6 @@
 #include <gtk/gtk.h>
 
 #include <epan/filesystem.h>
-#include <epan/ws_strsplit.h>
 
 #include <epan/prefs.h>
 #include "webbrowser.h"