From ce20c00049da8f1407138e78f9f4e939a1441c6a Mon Sep 17 00:00:00 2001
From: Guy Harris <gharris@sonic.net>
Date: Mon, 15 Mar 2021 15:29:40 -0700
Subject: [PATCH] Remove unnecessary inclues of wiretap/pcapng.h.

---
 cfile.c                         | 1 -
 editcap.c                       | 1 -
 epan/wslua/wslua_capture_info.c | 1 -
 sharkd.c                        | 1 -
 tshark.c                        | 1 -
 ui/export_pdu_ui_utils.c        | 1 -
 ui/summary.c                    | 1 -
 wiretap/erf.c                   | 1 -
 wiretap/lanalyzer.c             | 1 -
 wiretap/merge.c                 | 1 -
 wiretap/nettrace_3gpp_32_423.c  | 1 -
 wiretap/wtap.c                  | 1 -
 wiretap/wtap_opttypes.c         | 1 -
 13 files changed, 13 deletions(-)

diff --git a/cfile.c b/cfile.c
index ad4e9d7742f..ef4b28c58d1 100644
--- a/cfile.c
+++ b/cfile.c
@@ -14,7 +14,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <wiretap/pcapng.h>
 
 #include "cfile.h"
 
diff --git a/editcap.c b/editcap.c
index 87a6b6157ce..0e04b4092f8 100644
--- a/editcap.c
+++ b/editcap.c
@@ -83,7 +83,6 @@
 #include <wsutil/pint.h>
 #include <wsutil/strtoi.h>
 #include <wiretap/wtap_opttypes.h>
-#include <wiretap/pcapng.h>
 
 #include "ui/failure_message.h"
 
diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c
index 877fbda9f13..7108c48bf2c 100644
--- a/epan/wslua/wslua_capture_info.c
+++ b/epan/wslua/wslua_capture_info.c
@@ -16,7 +16,6 @@
 #include "wslua_file_common.h"
 
 #include <epan/addr_resolv.h>
-#include <wiretap/pcapng.h>
 
 
 /* WSLUA_CONTINUE_MODULE File */
diff --git a/sharkd.c b/sharkd.c
index b9561fffb9e..3456e0fcf82 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -31,7 +31,6 @@
 #include <wsutil/report_message.h>
 #include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
-#include <wiretap/pcapng.h>
 
 #include <epan/decode_as.h>
 #include <epan/timestamp.h>
diff --git a/tshark.c b/tshark.c
index 6378afd8bad..dcf85d01458 100644
--- a/tshark.c
+++ b/tshark.c
@@ -58,7 +58,6 @@
 #include <cli_main.h>
 #include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
-#include <wiretap/pcapng.h>
 
 #include "globals.h"
 #include <epan/timestamp.h>
diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c
index 97195ff3693..bb48e2a0e54 100644
--- a/ui/export_pdu_ui_utils.c
+++ b/ui/export_pdu_ui_utils.c
@@ -23,7 +23,6 @@
 #include <epan/epan_dissect.h>
 #include <wiretap/wtap.h>
 #include <wiretap/wtap_opttypes.h>
-#include <wiretap/pcapng.h>
 
 #include "ui/alert_box.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/summary.c b/ui/summary.c
index a34c20eb776..eca9c3eb0fa 100644
--- a/ui/summary.c
+++ b/ui/summary.c
@@ -12,7 +12,6 @@
 
 #include <wiretap/pcap-encap.h>
 #include <wiretap/wtap_opttypes.h>
-#include <wiretap/pcapng.h>
 
 #include <epan/packet.h>
 #include <wsutil/file_util.h>
diff --git a/wiretap/erf.c b/wiretap/erf.c
index fd1d5c3282f..bd3a91aab55 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -34,7 +34,6 @@
 #include "wtap-int.h"
 #include "file_wrappers.h"
 #include "pcap-encap.h"
-#include "pcapng.h"
 #include "erf.h"
 #include "erf_record.h"
 #include "erf-common.h"
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index c215072d462..a3e6bdc2749 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -12,7 +12,6 @@
 #include "wtap-int.h"
 #include "file_wrappers.h"
 #include "lanalyzer.h"
-#include "pcapng.h"
 
 /* The LANalyzer format is documented (at least in part) in Novell document
    TID022037, which can be found at, among other places:
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 8f156f2dab6..283cd917179 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include "merge.h"
 #include "wtap_opttypes.h"
-#include "pcapng.h"
 #include "wtap-int.h"
 
 #include <wsutil/filesystem.h>
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index c25b13e9243..5ca10ef52d9 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -33,7 +33,6 @@
 #include <wsutil/inet_addr.h>
 
 
-#include "pcapng.h"
 #include "nettrace_3gpp_32_423.h"
 
 /* String constants sought in the XML data.
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index ec7b0e34ef5..2b7ba238c0b 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -15,7 +15,6 @@
 
 #include "wtap-int.h"
 #include "wtap_opttypes.h"
-#include "pcapng.h"
 
 #include "file_wrappers.h"
 #include <wsutil/file_util.h>
diff --git a/wiretap/wtap_opttypes.c b/wiretap/wtap_opttypes.c
index 0dd2de8e34f..1e3e3ec798e 100644
--- a/wiretap/wtap_opttypes.c
+++ b/wiretap/wtap_opttypes.c
@@ -14,7 +14,6 @@
 #include "wtap.h"
 #include "wtap_opttypes.h"
 #include "wtap-int.h"
-#include "pcapng.h"
 #include "pcapng_module.h"
 
 #if 0