Sanitize epan includes

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

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index cb5896c96a71dd3dbedd847d5871a581af3a99e7..1f109eab74a2304b0ed52c269aefd7dda6bdf85e 100755 (executable)
--- 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 7eae11cd62a82f5ad6c6eb14a986aa6006ad4083..21692911fc2a24992566dbcb0b22e97c3a40632c 100644 (file)
--- 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 813eabea05b11008824997abc722b4d258e8ebbd..76d8c96e1234aa376b75fe517acb65b65aacf84c 100644 (file)
--- 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 01783c62735de64975207f2f92046491154fe022..16ac06ea0e5eeb43182132b1d41079bda139732a 100644 (file)
--- 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 5477073406f45e7bafae00ad75958936a0e8d5a8..248e66c2e9984988a648429f31f3a6857179ce24 100644 (file)
--- 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 b1ea0d0dd91e6484d231c6adfd6ac20eb85bba51..dcd5df002a732ff8cc3f3bfadf1115c9ee6fb37d 100644 (file)
--- 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 1c13d03e569cb3b06e746dfcab6beef624b78fb7..00e21e379853d8928579141f39266471ffa2fd6a 100644 (file)
--- 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 393f40c7d8ac55d9f24b93306a54bcdec983a0dc..6a7cc6b4ec75cf71a5fe856a95431a9c8b2571e0 100644 (file)
--- 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 61717a096734b07bfbb1a1352296d88318363e7d..2869eb68b1fd751e3d9a2f21b9aa5be875f3d48a 100644 (file)
--- 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 e2735ce9c757920a9801bbdcca87e08ff60e8284..67ba07eaad91b99c7858601929a7a610d59ecf73 100644 (file)
--- 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 d0d5ab1badcf02dcf95e760bc9bff3546520ceaa..5d321f9fdb56abf4c8c8bb248862c70bf7663afe 100644 (file)
--- 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 31fc3136c729bfd73be1fd78ae4c11c8d4f35e07..186a394d46433a0ac20bdc2b03428c8141d56df5 100644 (file)
--- 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 620128c699143d4d8f27b3454a02d343c0535b0f..d1a070bb9448553be7b15b561164c5dbf6de44e2 100644 (file)
--- 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 f1403e30ead91ad69ec173d5543c8cc5c7c40418..e1c73178be410522bccd3de662c9618a5b42a087 100644 (file)
--- 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 e7e61a627453035def17027fa3a993c1a55e6642..d8c178607641c8d468d1cccb34b65a5374d3366c 100644 (file)
--- 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 6ff0574c023a634c3ce30f2ef40cf1b82ccb069a..b16ea58b3570dbdb880b596c7175fb82b45c073b 100644 (file)
--- 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 5c3974f6b13ae1bf4161c15e26bc65db0d259868..ce152a66b5e7295a0baabc80ade9000055b555f0 100644 (file)
--- 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 0d837201ef34507accedaa92107dc01c726955cb..f85ba193d5d5e2690543be7599b6107f771c344d 100644 (file)
--- 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 1b215ca07754551c1a62158797d154401cf325b9..d952b5497b8431b85182b4dcca2d165ea1065164 100644 (file)
--- 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 3e416cd37d623a8d2b89d0faf976fc4cdea13193..6700f1ae9ee0b92a56c22b627bab78d0cf44b34b 100644 (file)
--- 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 bc1a777d3c35bf9299953642ec02e499f35dc99c..2eef6a6a3cc61956c08ba18f760958a4129bc8d1 100644 (file)
--- 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 5c3135bd323db3a84dfd3ee2a1b2cfbfb1189cd3..f0da743306f646c9d4d7f1f1bc95362450f2f6d9 100644 (file)
--- 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 410002a23fff449189a876f189fa7abc1d19d7ed..1d0ce3dba4b86503e159295c6d8aa0a11eb0835d 100644 (file)
--- 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 53899ce480c06d7a712cefdbb405ed29b5bf5634..b36e31a1738f4fc7e584d30c539fcd312f46d4f1 100644 (file)
--- 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 0d2b27b794933c28ce8bccf18da3630d614943ef..dbb3cb726cfcdad3ecb710db60ecfa4d55e92042 100644 (file)
--- 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 98e699ab85d92047e2a08eb42284ffb7f46151aa..f18a1cfa485b7a5ab728ecd7e77dedf8650b8c9c 100644 (file)
--- 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 9dbfe80a0ea0d656a1747e510f99f5807d210543..cfbd0972f3cdeb46e9eed002ff20034f7d465848 100644 (file)
--- 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 d544dd7891882907b79ea4528fee51d9c7d5617e..61ad5fd500a9db985d91eaa971bea01f940d97ee 100644 (file)
--- 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 705f1b2b9cbb5a3e6c772f3a0cf4503edebdd8b0..3d994d4bfee55888c4849c5f33afbf0cd559b4d0 100644 (file)
--- 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 d0e113770eb45e1d749147bd675a5b73b618c67b..66836aca668293fc49d073cc4c95680ebdeafd42 100644 (file)
--- 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 eaf313179344799fafa98ea22b76e98cbb93e287..493202197a2914684bb52e71a0e9356989819615 100644 (file)
--- 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 1a732d91c14364f27a6bfba533eaed448b6f7c76..8a16731d4bbd6a6fa7de668ca2cd4c9de6c3d732 100644 (file)
--- 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 241af0d34251c0aab6153a52ce6d823ded00dd74..bf9a64f6380017049b7492c1070c8fc580b30d63 100644 (file)
--- 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 cd42de51ee0a8f803bc1b37e209224d8efeef668..3189d88081924658afa4bc7947e463cf3db4f8c7 100644 (file)
--- 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 16386910708a01d264f6120f79ada596402c9ff3..cb3c4728caac7ba2b014d8c1e1322e65942c0b52 100644 (file)
--- 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 3c4a21c3ab8c8e01bcfe7084c2c07668ee596658..449ea18689d39dbccdaf7b32b65ddd81e2165c84 100644 (file)
--- 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 6e05938722ba99bc8e60ee6d7858b87f59eb9ae1..84bcfb3e77db0031ff9f81c0220eb504ebcac4cf 100644 (file)
--- 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 48bc917b8081e7acb37c6a7d051102243d973547..0632d5bcb7263af706bf39127aecfe02ac9929af 100644 (file)
--- 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 091073ecade0254f21a1f4d55d029fd8d1a6c9a4..ef0a02772fb9be9d7a59866617947c2474523493 100644 (file)
--- 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 ab76196cb99b185d6bd512d9b6f0576f1549bd09..f769957d259e5bfd6d1ada31a16e52853062b94d 100644 (file)
--- 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 80cb7f56703217018c958d929c624f17fc566431..a77a2947537503aeb9eba06035401c87093ee5c4 100644 (file)
--- 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 180bcd1b473f1ef6abc8a66fe6368ff539946b2a..b6c6970239dd502d241098582db7cb4e4bdbb627 100644 (file)
--- 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 ab7d20a6155f03ce0167d2a41affe1c995841b7e..613958d78671c129b4fec3b27b5df87ce21a2496 100644 (file)
--- 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 d7485904a62429616907c8afd0b76fae3642a206..060968f958364248c7f57d44e2ae824441383224 100644 (file)
--- 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 9745d4d838738b890bb322282de10f88065f3700..f18fa1f9ab8e50b9768f3ad37d8c73af349dfe49 100644 (file)
--- 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 b70ab69e5bfa17be495f4d1c2d51641d57b95cea..295f47295c04f4bd6758cd205c55726e9d230204 100644 (file)
--- 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 f7805749facdf5144aa55487216f6dbebc79e087..cbe388173bb0dd666d70b1078be922f4d29dd7f8 100644 (file)
--- 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"