#include <prefs.h> not req'd

svn path=/trunk/; revision=26089

44 files changed, 0 insertions, 48 deletions

diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 23e2c41647..6b26fd79df 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -42,7 +42,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index f54c3e226f..ac4679fa33 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/value_string.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index 33b7ae38e4..083a21d7d3 100644
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <glib.h>
-#include <epan/prefs.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 8be4d407ba..4291440d15 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -37,7 +37,6 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/sctpppids.h>
 
 #define NETWORK_BYTE_ORDER          FALSE
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index c5f1dcbf41..f6f278cf2f 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 /* forward reference */
 void proto_register_egd();
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 4893ab931a..550ae2fcff 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -41,7 +41,6 @@
 
 #include <glib.h>
 
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index f45f289118..60f7168f80 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -48,7 +48,6 @@
 
 #include <glib.h>
 
-#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 528a564d88..f335be3fb0 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -48,7 +48,6 @@
 
 #include <glib.h>
 
-#include <epan/prefs.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index eed71a9326..53a04535d6 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -44,7 +44,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
 
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index d98e92d78a..253dd2079d 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 
 #include "packet-rpc.h"
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index a674778a23..2780071fd5 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -43,7 +43,6 @@
 #include <string.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index d8207d4e40..5a0fb7d721 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -51,7 +51,6 @@
 #include <string.h>
 
 #include "epan/packet.h"
-#include <epan/prefs.h>
 
 #include <glib.h>
 
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index 8f22d10a05..433919faed 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-per.h>
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index b6cbacd52b..cad60771f1 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -42,8 +42,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
-
 #include "packet-h263.h"
 
 static int proto_h263_data		= -1;
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index ebbcf5aece..0a71e3bd34 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -31,7 +31,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 #include <epan/etypes.h>
 
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 5a4d79a22f..80b1ee999b 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -74,7 +74,6 @@
 #include <sys/stat.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/crc16.h>
 #include <epan/expert.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index e29528d398..5aab540858 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -37,7 +37,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>
 
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c
index 92f9eed178..1c92c38052 100644
--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@@ -36,7 +36,6 @@
 #include <string.h> 
 #include <glib.h> 
 #include <epan/packet.h> 
-#include <epan/prefs.h>
 
 /* DEFINES */
 
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c
index a509486e9c..6469a222c8 100644
--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@@ -37,7 +37,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-tcp.h>
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index a84a92d768..91c94956f4 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -39,7 +39,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/etypes.h>
 #include <epan/oui.h>
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index b0b844e168..3e5157e7e1 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -44,7 +44,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 #include <packet-mtp3.h>
 
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index d5e788a2aa..22b119af09 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include "packet-ncp-int.h"
 #include "packet-ncp-nmas.h"
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index c32247b429..7141b47a75 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -32,7 +32,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include "prefs.h"
 #include "packet-ncp-int.h"
 #include "packet-ncp-sss.h"
 
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 3f7f0b0be6..8526dabbd6 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -43,7 +43,6 @@
 #include <epan/ipproto.h>
 #include <epan/greproto.h>
 #include <epan/sminmpec.h>
-#include <epan/prefs.h>
 
 #include <epan/in_cksum.h>
 #include "packet-nhrp.h"
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 6e5e91699d..8b7d9284d3 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -41,7 +41,6 @@
 #include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 
-#include <epan/prefs.h>
 #include "packet-frame.h"
 
 /*differents types of objects*/
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index 941c7719f8..d9dd6e7ab7 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 #include "packet-mpls.h"
 
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index 4b6dbf48dc..f4276d1b60 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
-#include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include "packet-ip.h"
 
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 3f50d94e9f..53323a8ed4 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -38,7 +38,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 
 void proto_reg_handoff_redbackli(void);
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index de270bf64e..1cc3aaaf56 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -48,8 +48,6 @@
 #include <epan/rtp_pt.h>
 #include <epan/iax2_codec_type.h>
 
-#include "prefs.h"
-
 #include "packet-h263.h"
 
 /* H.263 header fields             */
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 58fe2d47c2..32f91b51a9 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 3170a2d198..7cf715c09b 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index 27cfad4796..77ceb56396 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -44,7 +44,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c
index 74d2c50545..f371f05121 100644
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index a35c7c8e1a..0c14c31ad1 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <epan/strutil.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index a32e72be4b..3e69efb25c 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -35,9 +35,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
-
-
 
 void proto_reg_handoff_synergy(void);
 
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index 47086b2594..391c67f795 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include "packet-t38.h"
-#include <epan/prefs.h>
 #include <epan/emem.h>
 
 #include "packet-t30.h"
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 515939d063..936f4d6212 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -29,7 +29,6 @@
 #endif
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/crc32.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 76f499eb84..6b3c3da41d 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -48,7 +48,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/ipproto.h>
 
 /* Forward declaration we need below */
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index af63b0fdf1..d9968015e9 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -37,7 +37,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/addr_resolv.h>
-#include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <epan/emem.h>
 
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index 48a35c22e3..b77c7f3770 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -28,7 +28,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/addr_resolv.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 2b46c3650e..2e82832d97 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -70,7 +70,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/etypes.h>
 #include <epan/oui.h>
 #include "packet-llc.h"
diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index a2b066a7eb..ad6aab0079 100644
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -34,7 +34,6 @@
 #include "packet-tpkt.h"
 #include "packet-frame.h"
 #include <epan/conversation.h>
-#include <epan/prefs.h>
 #include <epan/emem.h>
 
 /* X.224 header fields             */
diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c
index 35a7294cce..5a4482af05 100644
--- a/epan/dissectors/packet-xcsl.c
+++ b/epan/dissectors/packet-xcsl.c
@@ -37,7 +37,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 
 /* Pre definitions */
 void   proto_reg_handoff_xcsl(void);
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index 2b41f80b39..4b15cb41aa 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/prefs.h>
 #include <epan/ipproto.h>
 #include <epan/in_cksum.h>