6 files changed, 14 insertions, 22 deletions
diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
index 54b506485c..b97a1003c0 100644
--- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
+++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
@@ -52,7 +52,7 @@
  * information.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 
@@ -64,7 +64,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <wsutil/file_util.h>
-#include <wsutil/ws_diag_control.h>
 #include <wsutil/str_util.h>
 #include "packet-kerberos.h"
 #include "packet-netbios.h"
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c
index 76a12aa480..24443e6423 100644
--- a/epan/dissectors/packet-asterix.c
+++ b/epan/dissectors/packet-asterix.c
@@ -21,14 +21,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
+#include <config.h>
 
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include <wsutil/ws_diag_control.h>
-
 void proto_register_asterix(void);
 void proto_reg_handoff_asterix(void);
 
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index cb5c33ff53..02224e8e59 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -60,7 +60,7 @@
  * information.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 
@@ -72,7 +72,6 @@
 #include <epan/expert.h>
 #include <epan/prefs.h>
 #include <wsutil/file_util.h>
-#include <wsutil/ws_diag_control.h>
 #include <wsutil/str_util.h>
 #include "packet-kerberos.h"
 #include "packet-netbios.h"
@@ -350,7 +349,7 @@ static int hf_kerberos_KDCOptions_renew = -1;
 static int hf_kerberos_KDCOptions_validate = -1;
 
 /*--- End of included file: packet-kerberos-hf.c ---*/
-#line 173 "./asn1/kerberos/packet-kerberos-template.c"
+#line 172 "./asn1/kerberos/packet-kerberos-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_kerberos = -1;
@@ -426,7 +425,7 @@ static gint ett_kerberos_KERB_PA_PAC_REQUEST = -1;
 static gint ett_kerberos_ChangePasswdData = -1;
 
 /*--- End of included file: packet-kerberos-ett.c ---*/
-#line 187 "./asn1/kerberos/packet-kerberos-template.c"
+#line 186 "./asn1/kerberos/packet-kerberos-template.c"
 
 static expert_field ei_kerberos_decrypted_keytype = EI_INIT;
 static expert_field ei_kerberos_address = EI_INIT;
@@ -455,7 +454,7 @@ static gboolean gbl_do_col_info;
 #define KERBEROS_ADDR_TYPE_IPV6  24
 
 /*--- End of included file: packet-kerberos-val.h ---*/
-#line 200 "./asn1/kerberos/packet-kerberos-template.c"
+#line 199 "./asn1/kerberos/packet-kerberos-template.c"
 
 static void
 call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int tag, kerberos_callbacks *cb)
@@ -4342,7 +4341,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 /*--- End of included file: packet-kerberos-fn.c ---*/
-#line 1986 "./asn1/kerberos/packet-kerberos-template.c"
+#line 1985 "./asn1/kerberos/packet-kerberos-template.c"
 
 /* Make wrappers around exported functions for now */
 int
@@ -5396,7 +5395,7 @@ void proto_register_kerberos(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-kerberos-hfarr.c ---*/
-#line 2367 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2366 "./asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	/* List of subtrees */
@@ -5474,7 +5473,7 @@ void proto_register_kerberos(void) {
     &ett_kerberos_ChangePasswdData,
 
 /*--- End of included file: packet-kerberos-ettarr.c ---*/
-#line 2383 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2382 "./asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	static ei_register_info ei[] = {
diff --git a/epan/exntest.c b/epan/exntest.c
index ff9c88ec14..92eac68f5a 100644
--- a/epan/exntest.c
+++ b/epan/exntest.c
@@ -18,13 +18,12 @@
  *
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <glib.h>
-#include <config.h>
 #include "exceptions.h"
 
-#include <wsutil/ws_diag_control.h>
-
 gboolean failed = FALSE;
 
 DIAG_OFF(shadow)
diff --git a/epan/frame_data.h b/epan/frame_data.h
index a282c882fb..dd443ca38d 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <ws_diag_control.h>
+#include <ws_symbol_export.h>
 #include <wsutil/nstime.h>
-#include <wsutil/ws_diag_control.h>
-#include "ws_symbol_export.h"
 
 struct _packet_info;
 struct epan_session;
diff --git a/epan/tap.c b/epan/tap.c
index 16db81d619..1348e375dd 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 
@@ -40,8 +40,6 @@
 #include <epan/dfilter/dfilter.h>
 #include <epan/tap.h>
 
-#include <wsutil/ws_diag_control.h>
-
 static gboolean tapping_is_active=FALSE;
 
 typedef struct _tap_dissector_t {