Remove:

#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24859 f5534014-38df-0310-8fa8-9805f1628bb7

37 files changed, 59 insertions, 144 deletions

diff --git a/airpcap_loader.c b/airpcap_loader.c
index 411df70c8e..c622d877ea 100644
--- a/airpcap_loader.c
+++ b/airpcap_loader.c
@@ -54,9 +54,6 @@
 #include <airpcap.h>
 #include "airpcap_loader.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 /*
  * We load dynamically the dag library in order link it only when
diff --git a/capture-wpcap.c b/capture-wpcap.c
index 04ebe5e322..10d5cb8da5 100644
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -42,11 +42,6 @@
 /* XXX - yes, I know, I should move cppmagic.h to a generic location. */
 #include "tools/lemon/cppmagic.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
-
 #define MAX_WIN_IF_NAME_LEN 511
 
 
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index be52088590..22e8aa4e04 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -56,9 +56,6 @@
 
 #include "wep-wpadefs.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "../g_ascii_strcasecmp.h"
-#endif
 
 /****************************************************************************/
 
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 2e48be2adb..7c3fb259c7 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -36,9 +36,6 @@
 #include <epan/exceptions.h>
 #include <epan/packet.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 /* Enable debug logging by defining AM_CFLAGS
  * so that it contains "-DDEBUG_dfilter".
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 724b47852c..11354f3d5a 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -59,9 +59,6 @@ Specs:
 #include <epan/packet.h>
 #include <epan/emem.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 /* protocol handles */
 static int proto_njack = -1;
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index a1808384ea..d5d435d606 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -41,10 +41,6 @@
 
 #include "packet-afp.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* The information in this module (AFP) comes from:
 
   AFP 2.1 & 2.2 documentation, in PDF form, at
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 38bb101fdc..c2dac27303 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -42,10 +42,6 @@
 #include <epan/prefs.h>
 #include <epan/emem.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* Forward declaration */
 void proto_reg_handoff_cigi(void);
 static gboolean packet_is_cigi(tvbuff_t*);
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 0d4ec50670..a739c14f31 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -45,10 +45,6 @@
 #include "packet-edonkey.h"
 #include "packet-tcp.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 static int proto_edonkey = -1;
 
 static int hf_edonkey_message  = -1;
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index d343831474..cc67d5035a 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -303,9 +303,6 @@
 #include "packet-tcp.h"
 #include <wiretap/file_util.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 /*
  * Set to 1 for DEBUG output - TODO make this a runtime option
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index cd06cede68..a02fa48ca2 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -61,9 +61,6 @@ typedef enum _http_type {
 
 #include <epan/tap.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 static int http_tap = -1;
 static int http_eo_tap = -1;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 8cd9e99be4..c339793a18 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -111,10 +111,6 @@
 #define MAX_ENCRYPTION_KEYS 64
 #endif
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #ifndef roundup2
 #define	roundup2(x, y)  (((x)+((y)-1))&(~((y)-1)))  /* if y is powers of two */
 #endif
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 06c709cfeb..5f4dad9e71 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -85,9 +85,6 @@ HMAC-SHA256 : any keylen
 #include <gcrypt.h>
 #endif /* HAVE_LIBGCRYPT */
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 static int proto_ah = -1;
 static int hf_ah_spi = -1;
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 60fda2535d..f9aae24066 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -67,10 +67,6 @@
 #include <epan/gcp.h>
 #include <epan/tap.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #define PORT_MEGACO_TXT 2944
 #define PORT_MEGACO_BIN 2945
 
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 1a6539cec8..a45759056c 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -48,9 +48,6 @@
 #include <epan/strutil.h>
 #include "packet-mgcp.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 #define TCP_PORT_MGCP_GATEWAY 2427
 #define UDP_PORT_MGCP_GATEWAY 2427
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 2d164f6099..e9b9d2c4c5 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -73,10 +73,6 @@
 
 #include "packet-imf.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* Dissector table for media requiring special attention in multipart
  * encapsulation. */
 static dissector_table_t multipart_media_subdissector_table;
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 996dfc921f..ae444468f4 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -48,10 +48,6 @@
 #include <epan/strutil.h>
 #include "packet-tcp.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #define TCP_PORT_PVFS2 3334
 
 #define PVFS2_FH_LENGTH 8
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 733e05ded1..18f89bc7e8 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -68,11 +68,6 @@
 #include <epan/expert.h>
 #include <epan/strutil.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
-
 /* Version is the first 2 bits of the first octet*/
 #define RTCP_VERSION(octet)	((octet) >> 6)
 
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index 0dae2c300f..93b1866692 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -48,10 +48,6 @@
 #include "packet-e164.h"
 #include <epan/emem.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 static int proto_rtsp		= -1;
 
 static gint ett_rtsp		= -1;
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 3fd922c449..ea375b3909 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -51,6 +51,7 @@
 #include "packet-per.h"
 #include "packet-e212.h"
 #include "packet-gsm_map.h"
+#include "packet-gsm_sms.h"
 
 #ifdef _MSC_VER
 /* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
@@ -103,7 +104,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-sabp-val.h ---*/
-#line 57 "packet-sabp-template.c"
+#line 58 "packet-sabp-template.c"
 
 static dissector_handle_t sabp_handle = NULL;
 static dissector_handle_t sabp_tcp_handle = NULL;
@@ -111,6 +112,7 @@ static dissector_handle_t sabp_tcp_handle = NULL;
 /* Initialize the protocol and registered fields */
 static int proto_sabp = -1;
 
+static int hf_sabp_no_of_pages = -1;
 
 /*--- Included file: packet-sabp-hf.c ---*/
 #line 1 "packet-sabp-hf.c"
@@ -191,12 +193,13 @@ static int hf_sabp_successfulOutcome_value = -1;  /* SuccessfulOutcome_value */
 static int hf_sabp_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-sabp-hf.c ---*/
-#line 65 "packet-sabp-template.c"
+#line 67 "packet-sabp-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_sabp = -1;
 static int ett_sabp_e212 = -1;
-static int ett_sabp_cbs_data_coding = -1;;
+static int ett_sabp_cbs_data_coding = -1;
+static int ett_sabp_bcast_msg = -1;
 
 
 /*--- Included file: packet-sabp-ett.c ---*/
@@ -242,7 +245,7 @@ static gint ett_sabp_SuccessfulOutcome = -1;
 static gint ett_sabp_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-sabp-ett.c ---*/
-#line 72 "packet-sabp-template.c"
+#line 75 "packet-sabp-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -471,8 +474,49 @@ dissect_sabp_Available_Bandwidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 
 static int
 dissect_sabp_Broadcast_Message_Content(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 170 "sabp.cnf"
+ tvbuff_t *parameter_tvb=NULL;
+ proto_tree *subtree;
+  int			length, par_offset;
+  guint8		out_len, no_of_pages;
+ static unsigned char bigbuf[1024];
+
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
-                                     1, 9968, FALSE, NULL);
+                                     1, 9968, FALSE, &parameter_tvb);
+
+	if (!parameter_tvb)
+		return offset;
+	subtree = proto_item_add_subtree(actx->created_item, ett_sabp_bcast_msg);
+	par_offset = 0;
+	/* Number-of-Pages */
+	no_of_pages = tvb_get_guint8(parameter_tvb,0);
+	proto_tree_add_item(subtree, hf_sabp_no_of_pages, parameter_tvb, par_offset, 1, FALSE);
+
+	if((no_of_pages > 82)||(no_of_pages == 1)){
+		proto_tree_add_text(subtree, parameter_tvb, 0, -1, "Wrong number of pages");
+		return offset;
+	}
+	par_offset++;
+	length = tvb_length_remaining(parameter_tvb,par_offset);
+
+	switch(sms_encoding){
+    case SMS_ENCODING_7BIT:
+    case SMS_ENCODING_7BIT_LANG:
+	out_len = gsm_sms_char_7bit_unpack(par_offset, length, sizeof(bigbuf),
+					   tvb_get_ptr(parameter_tvb, par_offset, length),
+						       bigbuf);
+
+	bigbuf[out_len] = '\0';
+	gsm_sms_char_ascii_decode(bigbuf, bigbuf, out_len);
+	bigbuf[1023] = '\0';
+	proto_tree_add_text(tree, parameter_tvb, par_offset, length, "USSD String: %s", bigbuf);
+	break;
+    case SMS_ENCODING_8BIT:
+	proto_tree_add_text(tree, parameter_tvb , par_offset, length, "USSD String: %s", tvb_get_ptr(parameter_tvb, par_offset, length));
+	break;
+    default:
+	break;	
+  }
 
   return offset;
 }
@@ -1602,7 +1646,7 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-sabp-fn.c ---*/
-#line 96 "packet-sabp-template.c"
+#line 99 "packet-sabp-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
@@ -1680,6 +1724,11 @@ void proto_register_sabp(void) {
   /* List of fields */
 
   static hf_register_info hf[] = {
+    { &hf_sabp_no_of_pages,
+      { "Number-of-Pages", "sabp.no_of_pages",
+        FT_UINT8, BASE_DEC, NULL, 0,
+        "Number-of-Pages", HFILL }},
+
 
 /*--- Included file: packet-sabp-hfarr.c ---*/
 #line 1 "packet-sabp-hfarr.c"
@@ -1985,7 +2034,7 @@ void proto_register_sabp(void) {
         "sabp.UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-sabp-hfarr.c ---*/
-#line 174 "packet-sabp-template.c"
+#line 182 "packet-sabp-template.c"
   };
 
   /* List of subtrees */
@@ -1993,6 +2042,7 @@ void proto_register_sabp(void) {
 		  &ett_sabp,
 		  &ett_sabp_e212,
 		  &ett_sabp_cbs_data_coding,
+		  &ett_sabp_bcast_msg,
 
 /*--- Included file: packet-sabp-ettarr.c ---*/
 #line 1 "packet-sabp-ettarr.c"
@@ -2037,7 +2087,7 @@ void proto_register_sabp(void) {
     &ett_sabp_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-sabp-ettarr.c ---*/
-#line 182 "packet-sabp-template.c"
+#line 191 "packet-sabp-template.c"
   };
 
 
@@ -2111,7 +2161,7 @@ proto_reg_handoff_sabp(void)
 
 
 /*--- End of included file: packet-sabp-dis-tab.c ---*/
-#line 214 "packet-sabp-template.c"
+#line 223 "packet-sabp-template.c"
 
   sabp_handle = find_dissector("sabp");
   dissector_add("tcp.port", 3452, sabp_tcp_handle);
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index bf17a925e7..cfaad56d3f 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -60,10 +60,6 @@
 #include "packet-frame.h"
 #include "tap.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 static Standard_Type decode_mtp3_standard;
 #define SCCP_SI 3
 
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index c746a41bd7..307c8514c5 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -67,10 +67,6 @@
 #include "packet-tcp.h"
 #include "packet-ssl.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #define TCP_PORT_SIP 5060
 #define UDP_PORT_SIP 5060
 #define TLS_PORT_SIP 5061
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 32b79aa850..096400c72e 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -42,10 +42,6 @@
 #include <epan/emem.h>
 #include <epan/reassemble.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* RFC 2821 */
 #define TCP_PORT_SMTP 25
 
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index 4ab245cc15..9b719d63b2 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -34,10 +34,6 @@
 #include <epan/packet.h>
 #include "packet-sqloracle.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #define SWAP_UI16(ui16)	(((ui16)>>8 & 0xff) | ((ui16)<<8 & 0xff00))
 
 /* option flag 1 */
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 92fb4e2929..f0fcdb7617 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -51,10 +51,6 @@
 #include <epan/emem.h>
 #include <epan/expert.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* Things we may want to remember for a whole conversation */
 typedef struct _tftp_conv_info_t {
 	guint16 blocksize;
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 7d2a51fdde..76f499eb84 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -51,10 +51,6 @@
 #include <epan/prefs.h>
 #include <epan/ipproto.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* Forward declaration we need below */
 void proto_reg_handoff_tivoconnect(void);
 
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 72b69f9631..8bce57cf9e 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -59,9 +59,6 @@
 #include "packet-x11-keysym.h" /* This contains the X11 value_string
 				* "keysym_vals_source" that VNC also uses. */
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 static const value_string security_types_vs[] = {
 	{ 0,  "Invalid"  },
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index d7505faf1c..ffcefa6a4d 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -62,9 +62,6 @@
 /* We need the function tvb_get_guintvar() */
 #include "packet-wap.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 /* General-purpose debug logger.
  * Requires double parentheses because of variable arguments of printf().
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 681ccb1227..c4d648b906 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -59,10 +59,6 @@
 #include "packet-wap.h"
 #include "packet-wsp.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* General-purpose debug logger.
  * Requires double parentheses because of variable arguments of printf().
  *
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 2b0dcf394e..21b4b69d1d 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -54,9 +54,6 @@
 #include <epan/prefs.h>
 #include <epan/garrayfix.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
 
 typedef struct _xml_ns_t {
     /* the name of this namespace */
diff --git a/epan/prefs.c b/epan/prefs.c
index c74759062c..ab1ae76cdc 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -51,10 +51,6 @@
 #include <epan/prefs-int.h>
 #include <epan/uat-int.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /* Internal functions */
 static module_t *find_subtree(module_t *parent, const char *tilte);
 static module_t *prefs_register_module_or_subtree(module_t *parent,
diff --git a/epan/proto.c b/epan/proto.c
index 60f5fe7e42..2473ef94ec 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -47,10 +47,6 @@
 #include "asm_utils.h"
 #include "column-utils.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 #define SUBTREE_ONCE_ALLOCATION_NUMBER 8
 #define SUBTREE_MAX_LEVELS 256
 
diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c
index 99bee6705d..957ff998bb 100644
--- a/epan/req_resp_hdrs.c
+++ b/epan/req_resp_hdrs.c
@@ -34,10 +34,6 @@
 
 #include <epan/req_resp_hdrs.h>
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /*
  * Optionally do reassembly of the request/response line, headers, and body.
  */
diff --git a/epan/strutil.c b/epan/strutil.c
index a9083a8975..f6dc886be6 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -39,10 +39,6 @@
 #include <wchar.h>
 #endif
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 static const char hex[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
 			      '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index eda82a28e7..1327471f10 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -51,10 +51,6 @@
 #include "emem.h"
 #include "proto.h"	/* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 static const guint8*
 ensure_contiguous_no_exception(tvbuff_t *tvb, gint offset, gint length,
 		int *exception);
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index df4da31c85..7ddf58db72 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -40,10 +40,6 @@
 #include <epan/guid-utils.h>
 #include "exceptions.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "g_ascii_strcasecmp.h"
-#endif
-
 /** @file
  * "testy, virtual(-izable) buffer".  They are testy in that they get mad when
  * an attempt is made to access data beyond the bounds of their array. In that
diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c
index 745dbd64e9..816388bd87 100644
--- a/tap-mgcpstat.c
+++ b/tap-mgcpstat.c
@@ -41,10 +41,6 @@
 #include "epan/dissectors/packet-mgcp.h"
 #include "timestats.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "epan/g_ascii_strcasecmp.h"
-#endif
-
 #define NUM_TIMESTATS 11
 
 /* used to keep track of the statistics for an entire program interface */
diff --git a/util.c b/util.c
index ddbc6a77c5..c614e4b5e4 100644
--- a/util.c
+++ b/util.c
@@ -43,10 +43,6 @@
 
 #include "util.h"
 
-#ifdef NEED_G_ASCII_STRCASECMP_H
-#include "epan/g_ascii_strcasecmp.h"
-#endif
-
 /*
  * Collect command-line arguments as a string consisting of the arguments,
  * separated by spaces.