Removed duplicated #include lines

Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

asn1/rrc/packet-rrc-template.c

@@ -180,7 +180,6 @@ static void rrc_free_value(gpointer value ){
 }
 #include "packet-rrc-fn.c"
 
-#include "packet-rrc.h"
 
 
 static void

asn1/spnego/packet-spnego-template.c

@@ -35,7 +35,6 @@
 #include <epan/expert.h>
 #include <epan/asn1.h>
 #include <epan/conversation.h>
-#include <epan/asn1.h>
 #include <wsutil/rc4.h>
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"

captype.c

@@ -62,7 +62,6 @@
 
 #include "wtap.h"
 #include <wsutil/report_err.h>
-#include <wsutil/privileges.h>
 #include <wsutil/str_util.h>
 
 #ifdef _WIN32

codecs/codecs.c

@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include "codecs.h"
-#include "config.h"
 
 #include "G711a/G711adecode.h"
 #include "G711u/G711udecode.h"

dumpcap.c

@@ -100,7 +100,6 @@
 #include "pcapio.h"
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
 #endif
 

echld/echld-int.h

@@ -76,7 +76,6 @@
 #include "epan/prefs.h"
 #include "epan/ex-opt.h"
 #include "epan/funnel.h"
-#include "epan/prefs.h"
 #include "epan/timestamp.h"
 #include "epan/disabled_protos.h"
 #include "echld.h"

epan/dissectors/packet-cell_broadcast.c

@@ -28,7 +28,6 @@
 
 #include <epan/asn1.h>
 
-#include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/reassemble.h>
 

epan/dissectors/packet-rrc.c

@@ -143766,7 +143766,6 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
 /*--- End of included file: packet-rrc-fn.c ---*/
 #line 182 "../../asn1/rrc/packet-rrc-template.c"
 
-#include "packet-rrc.h"
 
 
 static void

epan/dissectors/packet-smb.c

@@ -39,7 +39,6 @@
 #include "packet-smb.h"
 #include "packet-ipx.h"
 #include "packet-idp.h"
-#include "packet-smb.h"
 #include "packet-smb-common.h"
 #include "packet-smb-mailslot.h"
 #include "packet-smb-pipe.h"

epan/dissectors/packet-spnego.c

@@ -43,7 +43,6 @@
 #include <epan/expert.h>
 #include <epan/asn1.h>
 #include <epan/conversation.h>
-#include <epan/asn1.h>
 #include <wsutil/rc4.h>
 #include "packet-dcerpc.h"
 #include "packet-gssapi.h"

epan/except.c

@@ -378,7 +378,6 @@ void except_free(void *ptr)
 
 #ifdef KAZLIB_TEST_MAIN
 
-#include <stdio.h>
 
 static void cleanup(void *arg)
 {

rawshark.c

@@ -119,10 +119,6 @@
 #endif /* HAVE_LIBPCAP */
 #include "log.h"
 
-#ifdef _WIN32
-#include <wsutil/unicode-utils.h>
-#endif /* _WIN32 */
-
 #if 0
 /*
  * This is the template for the decode as option; it is shared between the

tfshark.c

@@ -91,7 +91,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/timestamp.h>
 #include <epan/ex-opt.h>
 #include <wiretap/wtap-int.h>
 #include <wiretap/file_wrappers.h>

tools/lemon/lempar.c

@@ -200,7 +200,6 @@ struct yyParser {
 typedef struct yyParser yyParser;
 
 #ifndef NDEBUG
-#include <stdio.h>
 static FILE *yyTraceFILE = 0;
 static char *yyTracePrompt = 0;
 #endif /* NDEBUG */

tshark.c

@@ -101,7 +101,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
-#include <epan/timestamp.h>
 #include <epan/conversation_table.h>
 #include <epan/ex-opt.h>
 
@@ -118,7 +117,6 @@
 #endif /* _WIN32 */
 #include <capchild/capture_session.h>
 #include <capchild/capture_sync.h>
-#include "capture_opts.h"
 #endif /* HAVE_LIBPCAP */
 #include "log.h"
 #include <epan/funnel.h>

ui/gtk/about_dlg.c

@@ -54,7 +54,6 @@
 #include "ui/gtk/gtkglobals.h"
 #include "ui/gtk/main.h"
 #include "ui/gtk/plugins_dlg.h"
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/wssplash.h"
 

ui/gtk/compare_stat.c

@@ -70,7 +70,6 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
-#include "gui_utils.h"
 #include "globals.h"
 
 /* Color settings */

ui/gtk/follow_tcp.c

@@ -39,7 +39,6 @@
 #include <epan/charsets.h>
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
-#include <epan/charsets.h>
 
 #include "../file.h"
 #include "ui/alert_box.h"

ui/gtk/iax2_analysis.c

@@ -84,7 +84,6 @@
 #include "ui/rtp_stream.h"
 #include "ui/gtk/rtp_stream_dlg.h"
 #include "ui/gtk/old-gtk-compat.h"
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/stock_icons.h"
 
 #include "frame_tvbuff.h"

ui/gtk/io_stat.c

@@ -52,7 +52,6 @@
 #include "ui/main_statusbar.h"
 
 #include "ui/gtk/old-gtk-compat.h"
-#include "ui/gtk/gui_utils.h"
 
 void register_tap_listener_gtk_iostat(void);
 

ui/gtk/memory_dlg.c

@@ -32,7 +32,6 @@
 #include "ui/simple_dialog.h"
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/old-gtk-compat.h"
-#include "ui/gtk/gui_utils.h"
 
 #include "wsutil/str_util.h"
 #include "epan/app_mem_usage.h"

ui/gtk/pixmap_save.c

@@ -34,8 +34,8 @@
 #include "ui/util.h"
 
 #include "ui/gtk/pixmap_save.h"
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/file_dlg.h"
+#include "ui/gtk/gui_utils.h"
 
 #include "ui/gtk/old-gtk-compat.h"
 #if GTK_CHECK_VERSION(2,22,0)

ui/gtk/prefs_dlg.c

@@ -53,7 +53,6 @@
 #include "ui/gtk/uat_gui.h"
 #include "ui/gtk/old-gtk-compat.h"
 #include "ui/gtk/file_dlg.h"
-#include "ui/gtk/dlg_utils.h"
 #include "ui/gtk/packet_win.h"
 #include "simple_dialog.h"
 

ui/gtk/rtp_player.c

@@ -81,7 +81,6 @@
 #include "ui/gtk/stock_icons.h"
 
 #include "ui/gtk/old-gtk-compat.h"
-#include "ui/gtk/gui_utils.h"
 
 static gboolean initialized = FALSE;
 

ui/gtk/rtp_stream.c

@@ -46,7 +46,6 @@
 #include "ui/tap-rtp-common.h"
 #include <wsutil/file_util.h>
 
-#include "ui/rtp_stream.h"
 #include "ui/gtk/rtp_stream_dlg.h"
 #include "ui/gtk/main.h"
 

ui/gtk/sctp_error_dlg.c

@@ -34,7 +34,6 @@
 #include "ui/gtk/main.h"
 #include "ui/tap-sctp-analysis.h"
 #include "ui/gtk/sctp_stat_gtk.h"
-#include "ui/gtk/gui_utils.h"
 #include "ui/gtk/stock_icons.h"
 
 static GtkWidget *sctp_error_dlg=NULL;

ui/proto_hier_stats.c

@@ -31,7 +31,6 @@
 #include <epan/epan_dissect.h>
 #include <wtap.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <glib.h>
 

ui/qt/about_dialog.cpp

@@ -58,7 +58,6 @@
 #include <QTextStream>
 #include <QUrl>
 
-#include "wireshark_application.h"
 
 // To do:
 // - Tweak and enhance ui...

ui/qt/follow_stream_dialog.cpp

@@ -50,7 +50,6 @@
 #include "ui/follow.h"
 
 #include "qt_ui_utils.h"
-#include "wireshark_application.h"
 
 #include <QKeyEvent>
 #include <QMessageBox>

ui/qt/preferences_dialog.cpp

@@ -35,7 +35,6 @@
 #include <ui/preference_utils.h>
 #include <main_window.h>
 
-#include "module_preferences_scroll_area.h"
 #include "syntax_line_edit.h"
 #include "qt_ui_utils.h"
 #include "uat_dialog.h"

wsutil/privileges.c

@@ -169,7 +169,6 @@ npf_sys_is_running() {
 #include <grp.h>
 #endif
 
-#include <glib.h>
 #include <string.h>
 #include <errno.h>
 

wsutil/sha1.c

@@ -339,7 +339,6 @@ void sha1_hmac( const guint8 *key, guint32 keylen, const guint8 *buf, guint32 bu
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <glib.h>
 #include <errno.h>
 
 /*