Sanitize epan includes

svn path=/trunk/; revision=29499

47 files changed, 65 insertions, 67 deletions

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index cb5896c96a..1f109eab74 100755
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -5729,12 +5729,12 @@ def produce_code():
 #include <epan/conversation.h>
 #include <epan/ptvcursor.h>
 #include <epan/emem.h>
+#include <epan/strutil.h>
+#include <epan/reassemble.h>
+#include <epan/tap.h>
 #include "packet-ncp-int.h"
 #include "packet-ncp-nmas.h"
 #include "packet-ncp-sss.h"
-#include <epan/strutil.h>
-#include "reassemble.h"
-#include <epan/tap.h>
 
 /* Function declarations for functions used in proto_register_ncp2222() */
 static void ncp_init_protocol(void);
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 7eae11cd62..21692911fc 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -43,7 +43,7 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define AMR_NB_SID 8
 #define AMR_WB_SID 9
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 813eabea05..76d8c96e12 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -48,8 +48,8 @@
 
 #include <string.h>
 
-#include "epan/packet.h"
-#include "epan/emem.h"
+#include <epan/packet.h>
+#include <epan/emem.h>
 
 
 static const char *ansi_proto_name_tele = "ANSI IS-637-A (SMS) Teleservice Layer";
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 01783c6273..16ac06ea0e 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -48,7 +48,7 @@
 
 #include <string.h>
 
-#include "epan/packet.h"
+#include <epan/packet.h>
 
 
 static const char *ansi_proto_name = "ANSI IS-683 (OTA (Mobile))";
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index 5477073406..248e66c2e9 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -51,7 +51,7 @@
 
 #include <string.h>
 
-#include "epan/packet.h"
+#include <epan/packet.h>
 
 
 static const char *ansi_proto_name = "ANSI IS-801 (Location Services (PLD))";
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index b1ea0d0dd9..dcd5df002a 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -48,7 +48,7 @@
 #include "packet-ber.h"
 #include "packet-tcap.h"
 #include "packet-ansi_tcap.h"
-#include "epan/tcap-persistentdata.h"
+#include <epan/tcap-persistentdata.h>
 
 #define PNAME  "ANSI Transaction Capabilities Application Part"
 #define PSNAME "ANSI_TCAP"
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 1c13d03e56..00e21e3798 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -38,7 +38,7 @@
 #include "packet-eth.h"
 #include "packet-tr.h"
 #include "packet-llc.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-pw-atm.h"
 
 static int proto_atm = -1;
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 393f40c7d8..6a7cc6b4ec 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -51,7 +51,7 @@
 #include <epan/oids.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
-#include "epan/expert.h"
+#include <epan/expert.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -64,8 +64,8 @@
 #include "packet-gsm_map.h"
 #include "packet-inap.h"
 #include "packet-tcap.h"
-#include "epan/camel-persistentdata.h"
-#include "epan/tcap-persistentdata.h"
+#include <epan/camel-persistentdata.h>
+#include <epan/tcap-persistentdata.h>
 
 #define PNAME  "Camel"
 #define PSNAME "CAMEL"
diff --git a/epan/dissectors/packet-dcerpc-dce122.c b/epan/dissectors/packet-dcerpc-dce122.c
index 61717a0967..2869eb68b1 100644
--- a/epan/dissectors/packet-dcerpc-dce122.c
+++ b/epan/dissectors/packet-dcerpc-dce122.c
@@ -24,7 +24,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 #include "packet-dcerpc-dce122.h"
 
 const value_string dce_error_vals[] = {
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index e2735ce9c7..67ba07eaad 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -91,13 +91,12 @@
 #include <epan/emem.h>
 #include <epan/addr_resolv.h>
 #include <epan/inet_aton.h>
+#include <epan/expert.h>
+#include <epan/prefs.h>
 #include <ctype.h>
 #include <isprint.h>
 #include "packet-dcerpc.h"
 #include "packet-dcom.h"
-#include "prefs.h"
-#include "expert.h"
-
 
 static int proto_dcom = -1;
 
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index d0d5ab1bad..5d321f9fdb 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -59,10 +59,10 @@
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
+#include <epan/diam_dict.h>
 #include "packet-tcp.h"
 #include "packet-ntp.h"
 #include "packet-diameter.h"
-#include "diam_dict.h"
 
 #define SCTP_PORT_DIAMETER	3868
 
diff --git a/epan/dissectors/packet-e164.h b/epan/dissectors/packet-e164.h
index 31fc3136c7..186a394d46 100644
--- a/epan/dissectors/packet-e164.h
+++ b/epan/dissectors/packet-e164.h
@@ -26,7 +26,7 @@
 #ifndef __PACKET_E164_H__
 #define __PACKET_E164_H__
 
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 
 extern const value_string E164_country_code_value[];
 extern const value_string E164_International_Networks_vals[];
diff --git a/epan/dissectors/packet-e212.h b/epan/dissectors/packet-e212.h
index 620128c699..d1a070bb94 100644
--- a/epan/dissectors/packet-e212.h
+++ b/epan/dissectors/packet-e212.h
@@ -26,7 +26,7 @@
 #ifndef __PACKET_E212_H__
 #define __PACKET_E212_H__
 
-#include "epan/value_string.h"
+#include <epan/value_string.h>
 
 extern const value_string E212_codes[];
 
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index f1403e30ea..e1c73178be 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -37,7 +37,7 @@
 #include "wiretap/atm.h"
 */
 #include "wiretap/erf.h"
-#include "epan/prefs.h"
+#include <epan/prefs.h>
 #include "packet-erf.h"
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index e7e61a6274..d8c1786076 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -34,7 +34,7 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #define I_FORMAT	1
 #define S_FORMAT	2
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 6ff0574c02..b16ea58b35 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -62,7 +62,7 @@
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/oids.h>
-#include "epan/expert.h"
+#include <epan/expert.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 5c3974f6b1..ce152a66b5 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -53,7 +53,7 @@
 
 #include <string.h>
 
-#include "epan/packet.h"
+#include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <glib.h>
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 0d837201ef..f85ba193d5 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -41,13 +41,13 @@
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/dissectors/packet-gssapi.h>
 #include <epan/dissectors/packet-frame.h>
-#include "epan/conversation.h"
-#include "epan/emem.h"
-#include "epan/prefs.h"
-#include "epan/reassemble.h"
+#include <epan/conversation.h>
+#include <epan/emem.h>
+#include <epan/prefs.h>
+#include <epan/reassemble.h>
 #include <epan/asn1.h>
 #include "packet-ber.h"
-#include "to_str.h"
+#include <epan/to_str.h>
 
 static int proto_gssapi = -1;
 
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 1b215ca077..d952b5497b 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -55,7 +55,7 @@
 #include <epan/oids.h>
 #include <epan/next_tvb.h>
 #include <epan/asn1.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "packet-h225.h"
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 3e416cd37d..6700f1ae9e 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -56,7 +56,7 @@
 #include <epan/emem.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-tpkt.h"
 #include "packet-per.h"
 #include "packet-h323.h"
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index bc1a777d3c..2eef6a6a3c 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -34,7 +34,7 @@
  */
 
 #include "packet-h248.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-tpkt.h"
 
 #define PNAME  "H.248 MEGACO"
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index 5c3135bd32..f0da743306 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -43,7 +43,7 @@
 #include <string.h>
 
 #include <epan/rtp_pt.h>
-#include "iax2_codec_type.h"
+#include <epan/iax2_codec_type.h>
 
 /* H.261 header fields             */
 static int proto_h261          = -1;
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index 410002a23f..1d0ce3dba4 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include "packet-h263.h"
 
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index 53899ce480..b36e31a173 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -42,7 +42,7 @@
 #include <epan/asn1.h>
 #include <epan/strutil.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c
index 0d2b27b794..dbb3cb726c 100644
--- a/epan/dissectors/packet-hip.c
+++ b/epan/dissectors/packet-hip.c
@@ -45,8 +45,8 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 
-#include "ipproto.h"
-#include "in_cksum.h"
+#include <epan/ipproto.h>
+#include <epan/in_cksum.h>
 
 #define HI_ALG_DSA 3
 #define HI_ALG_RSA 5
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 98e699ab85..f18a1cfa48 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -41,7 +41,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/oids.h>
-#include "epan/expert.h"
+#include <epan/expert.h>
 #include <epan/asn1.h>
 
 #include <stdio.h>
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 9dbfe80a0e..cfbd0972f3 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -46,7 +46,7 @@
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include "packet-scsi.h"
-#include "epan/nstime.h"
+#include <epan/nstime.h>
 #include <epan/emem.h>
 #include <epan/crc32.h>
 
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index d544dd7891..61ad5fd500 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -35,7 +35,7 @@
 #include "packet-isis.h"
 #include "packet-isis-clv.h"
 #include "packet-isis-hello.h"
-#include "epan/addr_resolv.h"
+#include <epan/addr_resolv.h>
 
 
 #define APPEND_BOOLEAN_FLAG(flag, item, string) \
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 705f1b2b9c..3d994d4bfe 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "epan/ipv4.h"
+#include <epan/ipv4.h>
 #include <epan/packet.h>
 #include "packet-osi.h"
 #include "packet-ipv6.h"
diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c
index d0e113770e..66836aca66 100644
--- a/epan/dissectors/packet-itdm.c
+++ b/epan/dissectors/packet-itdm.c
@@ -31,7 +31,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "epan/prefs.h"
+#include <epan/prefs.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_itdm        = -1;
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index eaf3131793..493202197a 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -38,7 +38,7 @@
 #include <epan/packet.h>
 #include <epan/proto.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 1a732d91c1..8a16731d4b 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -47,7 +47,7 @@
 #include <epan/sctpppids.h>
 #include <epan/emem.h>
 #include "packet-mtp3.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 #define SCTP_PORT_M3UA         2905
 #define NETWORK_BYTE_ORDER     FALSE
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 241af0d342..bf9a64f638 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -41,7 +41,7 @@
 #include <epan/proto.h>
 #include <epan/asn1.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 
 /* Initialize the protocol and registered fields */
 static int proto_mp4ves								= -1;
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index cd42de51ee..3189d88081 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -43,7 +43,7 @@
 #include <epan/strutil.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include "packet-msrp.h"
 
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 1638691070..cb3c4728ca 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -34,9 +34,9 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include "epan/prefs.h"
-#include "epan/crc16.h"
-#include "epan/expert.h"
+#include <epan/prefs.h>
+#include <epan/crc16.h>
+#include <epan/expert.h>
 
 #define LITTLE_ENDIAN_BYTE_ORDER TRUE
 
diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index 3c4a21c3ab..449ea18689 100644
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -34,7 +34,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-/* #include "strutil.h" */
 #include <epan/nlpid.h>
 
 /* Although this protocol is propietary it is documented in the SynOptics MIB's
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 6e05938722..84bcfb3e77 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -33,8 +33,8 @@
 #include "packet-rpc.h"
 #include "packet-portmap.h"
 #include <epan/ipproto.h>
-#include "epan/conversation.h"
-#include "epan/packet_info.h"
+#include <epan/conversation.h>
+#include <epan/packet_info.h>
 
 /*
  * See:
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 48bc917b80..0632d5bcb7 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -59,7 +59,7 @@
 #include "packet-e164.h"
 #include "packet-e212.h"
 #include "packet-frame.h"
-#include "tap.h"
+#include <epan/tap.h>
 
 static Standard_Type decode_mtp3_standard;
 #define SCCP_SI 3
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 091073ecad..ef0a02772f 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -57,7 +57,7 @@
 #include <epan/base64.h>
 #include <epan/asn1.h>
 
-#include "tap.h"
+#include <epan/tap.h>
 #include "packet-sdp.h"
 
 #include "packet-rtp.h"
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index ab76196cb9..f769957d25 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -41,8 +41,8 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include "prefs.h"
-#include "strutil.h"
+#include <epan/prefs.h>
+#include <epan/strutil.h>
 #include <epan/expert.h>
 #include <epan/sigcomp-udvm.h>
 #include <epan/sigcomp_state_hdlr.h>
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 80cb7f5670..a77a294753 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -29,9 +29,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "epan/packet_info.h"
-#include "epan/epan_dissect.h"
-#include "epan/proto.h"
+#include <epan/packet_info.h>
+#include <epan/epan_dissect.h>
+#include <epan/proto.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/strutil.h>
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 180bcd1b47..b6c6970239 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -67,7 +67,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/conversation.h>
-#include "etypes.h"
+#include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/emem.h>
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index ab7d20a615..613958d786 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -48,7 +48,7 @@
 #include <string.h>
 #include "packet-ber.h"
 #include "packet-tcap.h"
-#include "epan/tcap-persistentdata.h"
+#include <epan/tcap-persistentdata.h>
 
 #define PNAME  "Transaction Capabilities Application Part"
 #define PSNAME "TCAP"
diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h
index d7485904a6..060968f958 100644
--- a/epan/dissectors/packet-tcp.h
+++ b/epan/dissectors/packet-tcp.h
@@ -25,7 +25,7 @@
 #define __PACKET_TCP_H__
 
 #ifndef __CONVERSATION_H__
-#include "epan/conversation.h"
+#include <epan/conversation.h>
 #endif
 
 /* TCP flags */
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 9745d4d838..f18fa1f9ab 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -48,7 +48,7 @@
 #include <epan/packet.h>
 #include <epan/strutil.h>
 
-#include "oui.h"
+#include <epan/oui.h>
 
 #define TURBOCELL_TYPE_BEACON_NON_POLLING  0x00
 #define TURBOCELL_TYPE_BEACON_NORMAL	   0x40
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index b70ab69e5b..295f47295c 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -67,7 +67,7 @@
 #include <epan/packet.h>
 #include <epan/asn1.h>
 
-#include "prefs.h"
+#include <epan/prefs.h>
 #include "packet-bssap.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index f7805749fa..cbe388173b 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -54,9 +54,9 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#include "epan/packet.h"
-#include "epan/prefs.h"
-#include "epan/dissectors/packet-ntp.h"
+#include <epan/packet.h>
+#include <epan/prefs.h>
+#include "packet-ntp.h"
 
 #include "packet-zep.h"