Move prefs.c and prefs.h into the epan subdirectory.

svn path=/trunk/; revision=12115

Makefile.common

@@ -56,7 +56,6 @@ DISSECTOR_SUPPORT_INCLUDES =	\
 	oui.h	\
 	ppptypes.h	\
 	prefs-int.h	\
-	prefs.h	\
 	ptvcursor.h	\
 	reassemble.h	\
 	req_resp_hdrs.h	\

capture.c

@@ -140,7 +140,7 @@
 #include "pcap-util.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "globals.h"
 #include "conditions.h"
 #include "capture_stop_conditions.h"

capture_combo_utils.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "pcap-util.h"
 #include "capture_combo_utils.h"
 

column.c

@@ -40,7 +40,7 @@
 #endif
 
 #include <epan/timestamp.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "column.h"
 #include <epan/packet.h>
 

dftest.c

@@ -43,7 +43,7 @@
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
 #include <epan/filesystem.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "util.h"
 #include "epan/dfilter/dfilter.h"
 #include "register.h"

epan/Makefile.common

@@ -41,6 +41,7 @@ LIBETHEREAL_SRC = 		\
 	osi-utils.c		\
 	packet.c		\
 	plugins.c		\
+	prefs.c			\
 	proto.c			\
 	range.c			\
 	sna-utils.c		\
@@ -77,6 +78,7 @@ LIBETHEREAL_INCLUDES = 		\
 	packet_info.h		\
 	pint.h			\
 	plugins.h		\
+	prefs.h			\
 	proto.h			\
 	range.h			\
 	report_err.h		\
@@ -104,7 +106,6 @@ DISSECTOR_SUPPORT_SRC =	\
 	../h225-persistentdata.c	\
 	../in_cksum.c	\
 	../ipproto.c	\
-	../prefs.c	\
 	../ptvcursor.c	\
 	../reassemble.c	\
 	../req_resp_hdrs.c	\

epan/addr_resolv.c

@@ -103,7 +103,7 @@
 #include "ipv6-utils.h"
 #include "addr_resolv.h"
 #include "filesystem.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define ENAME_ETHERS 		"ethers"
 #define ENAME_IPXNETS 		"ipxnets"

epan/dissectors/packet-acse.c

@@ -37,7 +37,7 @@
 
 #include "packet-acse.h"
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include <epan/strutil.h>
 

epan/dissectors/packet-aim-buddylist.c

@@ -38,7 +38,7 @@
 #include <epan/strutil.h>
 
 #include "packet-aim.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define FAMILY_BUDDYLIST  0x0003
 

epan/dissectors/packet-aim-chat.c

@@ -40,7 +40,7 @@
 
 #include "packet-tcp.h"
 #include "packet-aim.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* SNAC families */
 #define FAMILY_CHAT       0x000E

epan/dissectors/packet-aim-generic.c

@@ -38,7 +38,7 @@
 #include <epan/strutil.h>
 
 #include "packet-aim.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define STRIP_TAGS 1
 

epan/dissectors/packet-aim.c

@@ -43,7 +43,7 @@
 
 #include "packet-tcp.h"
 #include "packet-aim.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define TCP_PORT_AIM 5190
 

epan/dissectors/packet-ansi_a.c

@@ -40,7 +40,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "tap.h"
 
 #include "packet-bssap.h"

epan/dissectors/packet-atalk.c

@@ -40,7 +40,7 @@
 #include <epan/atalk-utils.h>
 #include <epan/conversation.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 
 #include "packet-afp.h"

epan/dissectors/packet-beep.c

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/conversation.h>
 
 #define TCP_PORT_BEEP 10288

epan/dissectors/packet-ber.c

@@ -43,7 +43,7 @@
 #include <epan/packet.h>
 
 #include <epan/strutil.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ber.h"
 
 

epan/dissectors/packet-bgp.c

@@ -61,7 +61,7 @@
 #include "packet-ipv6.h"
 #include "packet-frame.h"
 #include "afn.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static const value_string bgptypevals[] = {
     { BGP_OPEN, "OPEN Message" },

epan/dissectors/packet-bootp.c

@@ -50,7 +50,7 @@
 #include "packet-arp.h"
 #include "packet-dns.h"				/* for get_dns_name() */
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "tap.h"
  
 static int bootp_dhcp_tap = -1;

epan/dissectors/packet-bssap.c

@@ -47,7 +47,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-bssap.h"
 
 #define BSSAP 0

epan/dissectors/packet-bvlc.c

@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/strutil.h>
 
 #include <glib.h>

epan/dissectors/packet-cast.c

@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include "packet-tcp.h"
 

epan/dissectors/packet-chdlc.c

@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include "etypes.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "chdlctypes.h"
 #include <epan/addr_resolv.h>
 #include "packet-chdlc.h"

epan/dissectors/packet-clnp.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include "reassemble.h"
 #include "packet-osi.h"

epan/dissectors/packet-cops.c

@@ -71,7 +71,7 @@
 
 #include "asn1.h"
 #include "format-oid.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* For PacketCable, port 2126 */
 #define TCP_PORT_COPS 3288

epan/dissectors/packet-cpfi.c

@@ -38,7 +38,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 void proto_reg_handoff_cpfi(void);
 

epan/dissectors/packet-dcerpc-mapi.c

@@ -33,7 +33,7 @@
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-mapi.h"
 #include "packet-windows-common.h"	/* for "NT_errors[]" */
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_dcerpc_mapi = -1;
 static int hf_mapi_opnum = -1;

epan/dissectors/packet-dcerpc-messenger.c

@@ -28,7 +28,7 @@
 #endif
 
 #include <glib.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"

epan/dissectors/packet-dcerpc-samr.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <string.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-samr.h"

epan/dissectors/packet-dcerpc.c

@@ -35,7 +35,7 @@
 #include <epan/packet.h>
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/conversation.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include "tap.h"
 #include <epan/dissectors/packet-frame.h>

epan/dissectors/packet-diameter.c

@@ -49,7 +49,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/report_err.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-tcp.h"
 
 #ifdef NEED_SNPRINTF_H

epan/dissectors/packet-distcc.c

@@ -39,7 +39,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 
 static int proto_distcc = -1;

epan/dissectors/packet-dnp.c

@@ -39,7 +39,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 
 /* DNP 3.0 constants */

epan/dissectors/packet-dns.c

@@ -41,7 +41,7 @@
 #include <epan/addr_resolv.h>
 #include "packet-dns.h"
 #include "packet-tcp.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_dns = -1;
 static int hf_dns_length = -1;

epan/dissectors/packet-dsi.c

@@ -34,7 +34,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-tcp.h"
 #include "packet-afp.h"
 

epan/dissectors/packet-eth.c

@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "etypes.h"
 #include <epan/addr_resolv.h>
 #include "packet-eth.h"

epan/dissectors/packet-fc.c

@@ -49,7 +49,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include <epan/conversation.h>
 #include "etypes.h"

epan/dissectors/packet-fcip.c

@@ -34,7 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /*
  * See:

epan/dissectors/packet-fcp.c

@@ -51,7 +51,7 @@
 # include "snprintf.h"
 #endif
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "etypes.h"

epan/dissectors/packet-fcsb3.c

@@ -52,7 +52,7 @@
 # include "snprintf.h"
 #endif
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "etypes.h"

epan/dissectors/packet-fcsp.c

@@ -52,7 +52,7 @@
 # include "snprintf.h"
 #endif
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "etypes.h"

epan/dissectors/packet-fddi.c

@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <epan/bitswap.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-fddi.h"
 #include "packet-llc.h"
 #include "tap.h"

epan/dissectors/packet-fr.c

@@ -45,7 +45,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-llc.h"
 #include "packet-chdlc.h"
 #include "xdlc.h"

epan/dissectors/packet-frame.c

@@ -32,7 +32,7 @@
 #include <epan/timestamp.h>
 #include <epan/tvbuff.h>
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "tap.h"
 
 int proto_frame = -1;

epan/dissectors/packet-ftam.c

@@ -38,7 +38,7 @@
 
 #include "packet-frame.h"
 #include "packet-ftam.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include <epan/strutil.h>
 

epan/dissectors/packet-fw1.c

@@ -90,7 +90,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "etypes.h"
 
 /* Place FW1 summary in proto tree */

epan/dissectors/packet-gsm_a.c

@@ -69,7 +69,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "tap.h"
 #include "asn1.h"
 

epan/dissectors/packet-gsm_sms.c

@@ -51,7 +51,7 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include "packet-gsm_sms.h"
 

epan/dissectors/packet-gsm_sms_ud.c

@@ -69,7 +69,7 @@
 
 #include <epan/packet.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 
 static void dissect_gsm_sms_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);

epan/dissectors/packet-gtp.c

@@ -36,7 +36,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-gtp.h"
 #include "packet-ipv6.h"
 #include "packet-ppp.h"

epan/dissectors/packet-h225.c

@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "tap.h"
 #include "packet-tpkt.h"
 #include "packet-per.h"

epan/dissectors/packet-h245.c

@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "t35.h"

epan/dissectors/packet-h450.c

@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-per.h"
 #include "packet-h225.h"
 #include "packet-h245.h"

epan/dissectors/packet-http.c

@@ -44,7 +44,7 @@
 
 #include "req_resp_hdrs.h"
 #include "packet-http.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 typedef enum _http_type {
 	HTTP_REQUEST,

epan/dissectors/packet-ieee80211.c

@@ -61,7 +61,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include "packet-ipx.h"
 #include "packet-llc.h"

epan/dissectors/packet-ip.c

@@ -38,7 +38,7 @@
 #include <epan/addr_resolv.h>
 #include "ipproto.h"
 #include "ip_opts.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include "etypes.h"
 #include "greproto.h"

epan/dissectors/packet-ipdc.c

@@ -46,7 +46,7 @@
 #include "packet-tcp.h"
 #include <epan/packet.h>
 #include "ipproto.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_ipdc = -1;
 static int hf_ipdc_nr = -1;

epan/dissectors/packet-ipsec.c

@@ -34,7 +34,7 @@
 #include "packet-ipsec.h"
 #include <epan/addr_resolv.h>
 #include "ipproto.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* Place AH payload in sub tree */
 static gboolean g_ah_payload_in_subtree = FALSE;

epan/dissectors/packet-ipv6.c

@@ -36,7 +36,7 @@
 #include "packet-ipv6.h"
 #include "ip_opts.h"
 #include <epan/addr_resolv.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include "ipproto.h"
 #include "etypes.h"

epan/dissectors/packet-iscsi.c

@@ -35,7 +35,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/conversation.h>
 #include "packet-scsi.h"
 #include "epan/nstime.h"

epan/dissectors/packet-isns.c

@@ -54,7 +54,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "packet-tcp.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 
 #define ISNS_PROTO_VER 0x1

epan/dissectors/packet-iua.c

@@ -36,7 +36,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "sctpppids.h"
 
 #define NETWORK_BYTE_ORDER          FALSE

epan/dissectors/packet-kerberos.c

@@ -61,7 +61,7 @@
 #include <epan/dissectors/packet-kerberos.h>
 #include <epan/dissectors/packet-netbios.h>
 #include <epan/dissectors/packet-tcp.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/dissectors/packet-pkinit.h>
 #include <epan/dissectors/packet-cms.h>

epan/dissectors/packet-kpasswd.c

@@ -31,7 +31,7 @@
 
 #include <epan/packet.h>
 #include "packet-kerberos.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_kpasswd = -1;
 static int hf_kpasswd_message_len = -1;

epan/dissectors/packet-laplink.c

@@ -42,7 +42,7 @@
 #include <epan/conversation.h>
 
 #include "packet-tcp.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define TCP_PORT_LAPLINK 1547
 #define UDP_PORT_LAPLINK 1547

epan/dissectors/packet-ldap.c

@@ -73,7 +73,7 @@
 #include <epan/packet.h>
 
 #include "asn1.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/conversation.h>
 #include "packet-frame.h"
 #include "tap.h"

epan/dissectors/packet-ldp.c

@@ -39,7 +39,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "afn.h"
 
 #include "packet-frame.h"

epan/dissectors/packet-lwapp.c

@@ -40,7 +40,7 @@
 #include "xmlstub.h"
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 
 #ifdef NEED_SNPRINTF_H

epan/dissectors/packet-m2pa.c

@@ -37,7 +37,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "sctpppids.h"
 
 #define NETWORK_BYTE_ORDER          FALSE

epan/dissectors/packet-m2ua.c

@@ -34,7 +34,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "sctpppids.h"
 
 #define SCTP_PORT_M2UA                  2904

epan/dissectors/packet-m3ua.c

@@ -43,7 +43,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "sctpppids.h"
 #include "packet-mtp3.h"
 

epan/dissectors/packet-mdshdr.c

@@ -54,7 +54,7 @@
 #include <epan/value_string.h>
 #include <etypes.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define MDSHDR_VERSION_OFFSET 		0
 

epan/dissectors/packet-mpls-echo.c

@@ -32,7 +32,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ntp.h"
 #include "packet-ldp.h"
 

epan/dissectors/packet-mpls.c

@@ -42,7 +42,7 @@
 #include <epan/packet.h>
 #include "ppptypes.h"
 #include "etypes.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ppp.h"
 
 static gint proto_mpls = -1;

epan/dissectors/packet-mq.c

@@ -72,7 +72,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include "reassemble.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-tcp.h"
 #include "packet-mq.h"
 

epan/dissectors/packet-mtp3.c

@@ -45,7 +45,7 @@
 
 #include <epan/packet.h>
 #include "tap.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_mtp3  = -1;

epan/dissectors/packet-mtp3mg.c

@@ -44,7 +44,7 @@
 #endif
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include <packet-mtp3.h>
 

epan/dissectors/packet-multipart.c

@@ -63,7 +63,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <glib.h>
 #include <ctype.h>
 

epan/dissectors/packet-mysql.c

@@ -41,7 +41,7 @@
 
 #include "packet-tcp.h"
 #include "reassemble.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* Capabilities */
 #define MYSQL_CAPS_LP 0x0001

epan/dissectors/packet-nbns.c

@@ -37,7 +37,7 @@
 #include "packet-netbios.h"
 #include "packet-tcp.h"
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_nbns = -1;
 static int hf_nbns_flags = -1;

epan/dissectors/packet-ncp-nmas.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ncp-int.h"
 #include "packet-ncp-nmas.h"
 

epan/dissectors/packet-ncp.c

@@ -45,7 +45,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ipx.h"
 #include "packet-tcp.h"
 #include "packet-ncp-int.h"

epan/dissectors/packet-ndmp.c

@@ -40,7 +40,7 @@
 #include "packet-rpc.h"
 #include "packet-scsi.h"
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 #include "rpc_defrag.h"
 

epan/dissectors/packet-ndps.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ipx.h"
 #include "packet-tcp.h"
 #include <epan/conversation.h>

epan/dissectors/packet-netbios.c

@@ -37,7 +37,7 @@
 #include <epan/packet.h>
 #include "llcsaps.h"
 #include "reassemble.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-netbios.h"
 
 /* Netbios command numbers */

epan/dissectors/packet-netflow.c

@@ -58,7 +58,7 @@
 #include <epan/packet.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define UDP_PORT_NETFLOW	2055
 

epan/dissectors/packet-nfs.c

@@ -36,7 +36,7 @@
 
 #include "packet-rpc.h"
 #include "packet-nfs.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_nfs = -1;
 

epan/dissectors/packet-nlm.c

@@ -40,7 +40,7 @@
 #include "packet-rpc.h"
 #include "packet-nfs.h"
 #include "packet-nlm.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <string.h>
 
 /*

epan/dissectors/packet-ntlmssp.c

@@ -39,7 +39,7 @@
 #include "asn1.h"		/* XXX - needed for subid_t */
 #include "packet-gssapi.h"
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "crypt-rc4.h"
 #include "crypt-md4.h"
 #include "crypt-des.h"

epan/dissectors/packet-null.c

@@ -34,7 +34,7 @@
 #include <epan/packet.h>
 #include "packet-null.h"
 #include <epan/atalk-utils.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-ip.h"
 #include "packet-ipx.h"
 #include "packet-osi.h"

epan/dissectors/packet-per.c

@@ -38,7 +38,7 @@ proper helper routines
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-per.h"
 
 

epan/dissectors/packet-pgm.c

@@ -39,7 +39,7 @@
 #include "in_cksum.h"
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include <epan/proto.h>
 

epan/dissectors/packet-ppp.c

@@ -31,7 +31,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/packet.h>
 #include "packet-ppp.h"
 #include "ppptypes.h"

epan/dissectors/packet-pres.c

@@ -37,7 +37,7 @@
 
 #include "packet-pres.h"
 #include "packet-frame.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include <epan/strutil.h>
 

epan/dissectors/packet-q931.c

@@ -37,7 +37,7 @@
 #include "nlpid.h"
 #include "packet-q931.h"
 #include "packet-e164.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "reassemble.h"
 
 #include "lapd_sapi.h"

epan/dissectors/packet-quake.c

@@ -34,7 +34,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_quake = -1;
 static int hf_quake_header_flags = -1;

epan/dissectors/packet-quake2.c

@@ -36,7 +36,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_quake2 = -1;
 

epan/dissectors/packet-quake3.c

@@ -44,7 +44,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 
 static int proto_quake3 = -1;

epan/dissectors/packet-quakeworld.c

@@ -34,7 +34,7 @@
 #include <glib.h>
 #include <string.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 static int proto_quakeworld = -1;
 

epan/dissectors/packet-radius.c

@@ -47,7 +47,7 @@
 
 #include "packet-q931.h"
 #include "packet-gtp.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "crypt-md5.h"
 
 static int proto_radius = -1;

epan/dissectors/packet-raw.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-raw.h"
 #include "packet-ip.h"
 #include "packet-ppp.h"