From a269ae1b6a0a65d3e28a4c59487f7fd9b8a5685c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Tue, 26 Sep 2017 15:04:56 +0100
Subject: [PATCH] Rename "ws_version_info.h", also .c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's not installed so like most other files it doesn't need or benefit
from the prefix.

Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c
Reviewed-on: https://code.wireshark.org/review/23751
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
---
 .editorconfig                            |  2 +-
 .gitignore                               |  4 ++--
 CMakeLists.txt                           | 18 +++++++--------
 Makefile.am                              | 28 ++++++++++++------------
 capinfos.c                               |  2 +-
 captype.c                                |  2 +-
 dumpcap.c                                |  2 +-
 editcap.c                                |  2 +-
 epan/CMakeLists.txt                      |  2 +-
 epan/Makefile.am                         |  8 +++----
 epan/dissectors/packet-ssl-utils.c       |  2 +-
 epan/epan.c                              |  2 +-
 epan/print.c                             |  2 +-
 file.c                                   |  2 +-
 mergecap.c                               |  2 +-
 rawshark.c                               |  2 +-
 reordercap.c                             |  2 +-
 sharkd.c                                 |  2 +-
 text2pcap.c                              |  2 +-
 tfshark.c                                |  2 +-
 tools/oss-fuzzshark/fuzzshark.c          |  2 +-
 tshark.c                                 |  2 +-
 ui/commandline.c                         |  2 +-
 ui/decode_as_utils.c                     |  2 +-
 ui/export_pdu_ui_utils.c                 |  2 +-
 ui/gtk/about_dlg.c                       |  2 +-
 ui/gtk/file_import_dlg.c                 |  2 +-
 ui/gtk/follow_stream.c                   |  2 +-
 ui/gtk/main.c                            |  2 +-
 ui/gtk/main_titlebar.c                   |  2 +-
 ui/gtk/main_welcome.c                    |  2 +-
 ui/gtk/summary_dlg.c                     |  2 +-
 ui/qt/about_dialog.cpp                   |  2 +-
 ui/qt/capture_file_properties_dialog.cpp |  2 +-
 ui/qt/follow_stream_dialog.cpp           |  2 +-
 ui/qt/main_welcome.cpp                   |  2 +-
 ui/qt/main_window.cpp                    |  2 +-
 ui/tap_export_pdu.c                      |  2 +-
 ws_version_info.c => version_info.c      |  4 ++--
 ws_version_info.h => version_info.h      |  2 +-
 wireshark-qt.cpp                         |  2 +-
 wiretap/CMakeLists.txt                   |  2 +-
 wiretap/Makefile.am                      |  8 +++----
 wiretap/nettrace_3gpp_32_423.c           |  2 +-
 44 files changed, 73 insertions(+), 73 deletions(-)
 rename ws_version_info.c => version_info.c (99%)
 rename ws_version_info.h => version_info.h (99%)

diff --git a/.editorconfig b/.editorconfig
index 4e61cdbb6b..6d83a185fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -80,6 +80,6 @@ indent_size = tab
 indent_style = tab
 indent_size = tab
 
-[ws_version_info.[ch]]
+[version_info.[ch]]
 indent_style = tab
 indent_size = tab
diff --git a/.gitignore b/.gitignore
index 672b76fb46..7e9b1b75f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@ epan/register_wslua.c
 epan/taps.txt
 epan/taps_wslua.c
 epan/uat_load.c
-epan/ws_version_info.c
+epan/version_info.c
 epan/wslua/declare_wslua.h
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
@@ -59,7 +59,7 @@ tshark-tap-register.c
 wiretap/ascend.c
 wiretap/ascend.h
 wiretap/k12text.c
-wiretap/ws_version_info.c
+wiretap/version_info.c
 wireshark-tap-register.c
 wireshark-tap-register-cache.pkl
 ui/gtk/wireshark-gresources.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index afbff015ac..10983f4887 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1602,7 +1602,7 @@ set(SHARK_COMMON_SRC
 	cfile.c
 	frame_tvbuff.c
 	sync_pipe_write.c
-	ws_version_info.c
+	version_info.c
 )
 
 # sources for external capture interfaces
@@ -2592,7 +2592,7 @@ if(BUILD_randpkt)
 	)
 	set(randpkt_FILES
 		randpkt.c
-		ws_version_info.c
+		version_info.c
 	)
 	add_executable(randpkt ${randpkt_FILES})
 	add_dependencies(randpkt version)
@@ -2610,7 +2610,7 @@ if(BUILD_text2pcap)
 	)
 	set(text2pcap_CLEAN_FILES
 		text2pcap.c
-		ws_version_info.c
+		version_info.c
 	)
 	set(text2pcap_FILES
 		${text2pcap_CLEAN_FILES}
@@ -2635,7 +2635,7 @@ if(BUILD_mergecap)
 	)
 	set(mergecap_FILES
 		mergecap.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/mergecap.rc
 	)
 	add_executable(mergecap ${mergecap_FILES})
@@ -2654,7 +2654,7 @@ if(BUILD_reordercap)
 	)
 	set(reordercap_FILES
 		reordercap.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/reordercap.rc
 	)
 	add_executable(reordercap ${reordercap_FILES})
@@ -2675,7 +2675,7 @@ if(BUILD_capinfos)
 	)
 	set(capinfos_FILES
 		capinfos.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/capinfos.rc
 	)
 	add_executable(capinfos ${capinfos_FILES})
@@ -2695,7 +2695,7 @@ if(BUILD_captype)
 	)
 	set(captype_FILES
 		captype.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/captype.rc
 	)
 	add_executable(captype ${captype_FILES})
@@ -2715,7 +2715,7 @@ if(BUILD_editcap)
 	)
 	set(editcap_FILES
 		editcap.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/editcap.rc
 	)
 	add_executable(editcap ${editcap_FILES})
@@ -2747,7 +2747,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		dumpcap.c
 		ringbuffer.c
 		sync_pipe_write.c
-		ws_version_info.c
+		version_info.c
 		${CMAKE_BINARY_DIR}/image/dumpcap.rc
 	)
 	add_executable(dumpcap ${dumpcap_FILES})
diff --git a/Makefile.am b/Makefile.am
index b7db8736ef..afec9af059 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,7 +410,7 @@ WIRESHARK_COMMON_SRC = \
 	file.c			\
 	fileset.c		\
 	summary.c		\
-	ws_version_info.c
+	version_info.c
 
 if HAVE_EXTCAP
 SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC)
@@ -488,7 +488,7 @@ tshark_SOURCES = \
 	$(SHARK_COMMON_SRC)	\
 	capture_opts.c		\
 	tshark.c		\
-	ws_version_info.c
+	version_info.c
 
 tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -513,7 +513,7 @@ tshark_LDADD = \
 tfshark_SOURCES = \
 	$(SHARK_COMMON_SRC)	\
 	tfshark.c		\
-	ws_version_info.c
+	version_info.c
 
 tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -536,7 +536,7 @@ tfshark_LDADD = \
 rawshark_SOURCES = \
 	$(SHARK_COMMON_SRC)	\
 	rawshark.c		\
-	ws_version_info.c
+	version_info.c
 
 rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -562,7 +562,7 @@ sharkd_SOURCES = \
 	sharkd.h		\
 	sharkd_daemon.c		\
 	sharkd_session.c	\
-	ws_version_info.c
+	version_info.c
 
 sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -594,7 +594,7 @@ endif
 text2pcap_SOURCES = \
 	text2pcap.c		\
 	text2pcap-scanner.l	\
-	ws_version_info.c
+	version_info.c
 
 text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -612,7 +612,7 @@ text2pcap_LDADD = \
 
 mergecap_SOURCES = \
 	mergecap.c	\
-	ws_version_info.c
+	version_info.c
 
 mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -625,7 +625,7 @@ mergecap_LDADD = \
 
 capinfos_SOURCES = \
 	capinfos.c	\
-	ws_version_info.c
+	version_info.c
 
 capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -639,7 +639,7 @@ capinfos_LDADD = \
 
 captype_SOURCES = \
 	captype.c	\
-	ws_version_info.c
+	version_info.c
 
 captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -652,7 +652,7 @@ captype_LDADD = \
 
 editcap_SOURCES = \
 	editcap.c	\
-	ws_version_info.c
+	version_info.c
 
 editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -666,7 +666,7 @@ editcap_LDADD = \
 
 reordercap_SOURCES = \
 	reordercap.c	\
-	ws_version_info.c
+	version_info.c
 
 reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -679,7 +679,7 @@ reordercap_LDADD = \
 
 randpkt_SOURCES = \
 	randpkt.c	\
-	ws_version_info.c
+	version_info.c
 
 randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -716,7 +716,7 @@ dumpcap_SOURCES = \
 	dumpcap.c			\
 	ringbuffer.c			\
 	sync_pipe_write.c		\
-	ws_version_info.c
+	version_info.c
 
 dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -761,7 +761,7 @@ noinst_HEADERS = \
 	extcap.h		\
 	extcap_parser.h		\
 	extcap_spawn.h		\
-	ws_version_info.h
+	version_info.h
 
 #
 # Build the version string
diff --git a/capinfos.c b/capinfos.c
index 428093c2c9..dfea58e27a 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -75,7 +75,7 @@
 #include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS
diff --git a/captype.c b/captype.c
index 29cdad938f..289765c4e8 100644
--- a/captype.c
+++ b/captype.c
@@ -45,7 +45,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
diff --git a/dumpcap.c b/dumpcap.c
index 76fba65bcd..3ee8bef878 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -57,7 +57,7 @@
 #include <wsutil/cmdarg_err.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/strtoi.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
diff --git a/editcap.c b/editcap.c
index 22b44bd9c3..a9af646846 100644
--- a/editcap.c
+++ b/editcap.c
@@ -86,7 +86,7 @@
 #include <wsutil/report_message.h>
 #include <wsutil/strnatcmp.h>
 #include <wsutil/str_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/pint.h>
 #include <wsutil/strtoi.h>
 #include <wiretap/wtap_opttypes.h>
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 3f6d04266e..adadd689e5 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -280,7 +280,7 @@ set(LIBWIRESHARK_FILES
 	value_string.c
 	unit_strings.c
 	xdlc.c
-	${CMAKE_SOURCE_DIR}/ws_version_info.c
+	${CMAKE_SOURCE_DIR}/version_info.c
 )
 
 set(LIBWIRESHARK_CLEAN_FILES
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 58c41447f0..ac9630cffc 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -308,7 +308,7 @@ subpkginclude_HEADERS = $(LIBWIRESHARK_INCLUDES_PUBLIC)
 libwireshark_la_SOURCES = \
 	$(LIBWIRESHARK_SRC)		\
 	$(LIBWIRESHARK_INCLUDES_PRIVATE)	\
-	ws_version_info.c
+	version_info.c
 
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
@@ -402,7 +402,7 @@ DISTCLEANFILES = \
 	$(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
 	$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
 	dtd_grammar.out \
-	ws_version_info.c
+	version_info.c
 
 MAINTAINERCLEANFILES = \
 	$(LIBWIRESHARK_GENERATED_C_FILES) \
@@ -412,7 +412,7 @@ MAINTAINERCLEANFILES = \
 BUILT_SOURCES = \
 	$(LIBWIRESHARK_GENERATED_HEADER_FILES) \
 	$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
-	ws_version_info.c
+	version_info.c
 
 EXTRA_PROGRAMS = reassemble_test tvbtest oids_test exntest
 
@@ -452,7 +452,7 @@ dtd_grammar.h: dtd_grammar.c
 dtd_grammar.c : $(LEMON) $(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
 	$(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
 
-ws_version_info.c: $(top_srcdir)/ws_version_info.c
+version_info.c: $(top_srcdir)/version_info.c
 	$(AM_V_LN_S)$(LN_S) $<
 
 tvbtest.o exntest.o oids_test.o: exceptions.h
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 1797e37e14..378d35a9c3 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -51,7 +51,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/wsgcrypt.h>
 #include <wsutil/rsa.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include "packet-ber.h"
 #include "packet-x509af.h"
 #include "packet-x509if.h"
diff --git a/epan/epan.c b/epan/epan.c
index 74ddfe5001..03a9724e71 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/report_message.h>
 
 #include <epan/exceptions.h>
diff --git a/epan/print.c b/epan/print.c
index 435605c389..7534c5c9bc 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -38,7 +38,7 @@
 #include <epan/print.h>
 #include <epan/charsets.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/utf8_entities.h>
 #include <ftypes/ftypes-int.h>
 #include <wsutil/glib-compat.h>
diff --git a/file.c b/file.c
index 9d178770cd..97a05630f6 100644
--- a/file.c
+++ b/file.c
@@ -33,7 +33,7 @@
 #include <wsutil/tempfile.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/merge.h>
 
diff --git a/mergecap.c b/mergecap.c
index e696c0042f..97fcd135ec 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -49,7 +49,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/strnatcmp.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
diff --git a/rawshark.c b/rawshark.c
index 6a9dacc722..b59b3a3316 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -99,7 +99,7 @@
 #include <wiretap/pcap-encap.h>
 
 #include <wsutil/clopts_common.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "caputils/capture-pcap-util.h"
 
diff --git a/reordercap.c b/reordercap.c
index 352c0c5a08..0129fc4865 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -43,7 +43,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS
diff --git a/sharkd.c b/sharkd.c
index 8ca9ff328f..c575224531 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -43,7 +43,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 
diff --git a/text2pcap.c b/text2pcap.c
index 8a946589ca..e55fc046a3 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -112,7 +112,7 @@
 #include <string.h>
 #include <wsutil/file_util.h>
 #include <wsutil/crash_info.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/inet_addr.h>
 
 #ifdef _WIN32
diff --git a/tfshark.c b/tfshark.c
index 8eb591654c..db4c8d5d72 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -52,7 +52,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "globals.h"
 #include <epan/timestamp.h>
diff --git a/tools/oss-fuzzshark/fuzzshark.c b/tools/oss-fuzzshark/fuzzshark.c
index ac2c809e72..a88006ce69 100644
--- a/tools/oss-fuzzshark/fuzzshark.c
+++ b/tools/oss-fuzzshark/fuzzshark.c
@@ -38,7 +38,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/wtap.h>
 
diff --git a/tshark.c b/tshark.c
index 06f574ee4d..ca0e3cd003 100644
--- a/tshark.c
+++ b/tshark.c
@@ -65,7 +65,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 
diff --git a/ui/commandline.c b/ui/commandline.c
index b3e5f5c211..2d77761c47 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -36,7 +36,7 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wsutil/clopts_common.h>
 #include <wsutil/cmdarg_err.h>
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 0cf5942d57..321cfc5209 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -36,7 +36,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/filesystem.h"
 #include "wsutil/cmdarg_err.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 /* XXX - We might want to switch this to a UAT */
 
diff --git a/ui/export_pdu_ui_utils.c b/ui/export_pdu_ui_utils.c
index be8b8915ee..8a56fee2e7 100644
--- a/ui/export_pdu_ui_utils.c
+++ b/ui/export_pdu_ui_utils.c
@@ -28,7 +28,7 @@
 #include "wiretap/pcap-encap.h"
 #include "wsutil/os_version_info.h"
 #include "wsutil/tempfile.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 1db3bba6e8..a2980bf6bb 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -29,7 +29,7 @@
 
 #include <wsutil/filesystem.h>
 #include <wsutil/copyright_info.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
 #endif
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index b5745a6d7e..8d9f58db95 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -47,7 +47,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 #include "wiretap/wtap_opttypes.h"
 #include "wiretap/pcapng.h"
 
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index f85dac21e0..fe8578347c 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -42,7 +42,7 @@
 #include <ui/simple_dialog.h>
 
 #include <wsutil/file_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "gtkglobals.h"
 #include "ui/gtk/keys.h"
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 11c90e6dfe..d840e8475c 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -54,7 +54,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/merge.h>
 
diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c
index b180b79ca2..9b8ee56538 100644
--- a/ui/gtk/main_titlebar.c
+++ b/ui/gtk/main_titlebar.c
@@ -32,7 +32,7 @@
 #include "gui_utils.h"
 #include "main_titlebar.h"
 
-#include <ws_version_info.h>
+#include <version_info.h>
 
 /*
  * Key to attach the "un-decorated" title to the window, so that if the
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index a776425926..4a6abe89ac 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -33,7 +33,7 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture_ui_utils.h"
diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c
index 0dbe3a1e93..8d37d857f4 100644
--- a/ui/gtk/summary_dlg.c
+++ b/ui/gtk/summary_dlg.c
@@ -28,7 +28,7 @@
 
 
 
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "../../file.h"
 #include "../../summary.h"
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index c48d727ab5..25ce84edf0 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -51,7 +51,7 @@
 #include "wsutil/tempfile.h"
 #include "wsutil/plugins.h"
 #include "wsutil/copyright_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #ifdef HAVE_EXTCAP
 #include "extcap.h"
diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp
index e7c0aad6fa..e205f938b4 100644
--- a/ui/qt/capture_file_properties_dialog.cpp
+++ b/ui/qt/capture_file_properties_dialog.cpp
@@ -28,7 +28,7 @@
 
 #include "wsutil/str_util.h"
 #include "wsutil/utf8_entities.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index c200d724e2..d7af6b7ee5 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -40,7 +40,7 @@
 
 #include "wsutil/file_util.h"
 #include "wsutil/str_util.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include "ws_symbol_export.h"
 
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 3d8fde8cd9..303308fca7 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -28,7 +28,7 @@
 #include "ui/capture_globals.h"
 #include "ui/help_url.h"
 
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include "main_welcome.h"
 #include <ui_main_welcome.h>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index e7fcc99032..eeab9fa92f 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -33,7 +33,7 @@ DIAG_ON(frame-larger-than=)
 #include "epan/dissector_filters.h"
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <epan/prefs.h>
 #include <epan/stats_tree_priv.h>
 #include <epan/plugin_if.h>
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c
index 2e5ee3d4c2..d5e9b23a49 100644
--- a/ui/tap_export_pdu.c
+++ b/ui/tap_export_pdu.c
@@ -26,7 +26,7 @@
 #include "globals.h"
 #include "wiretap/pcap-encap.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
diff --git a/ws_version_info.c b/version_info.c
similarity index 99%
rename from ws_version_info.c
rename to version_info.c
index 7e5fed027d..9aefd8da65 100644
--- a/ws_version_info.c
+++ b/version_info.c
@@ -1,4 +1,4 @@
-/* ws_version_info.c
+/* version_info.c
  * Routines to report version information for Wireshark programs
  *
  * Wireshark - Network traffic analyzer
@@ -44,7 +44,7 @@
 
 #include "version.h"
 
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <wsutil/cpu_info.h>
 #include <wsutil/copyright_info.h>
diff --git a/ws_version_info.h b/version_info.h
similarity index 99%
rename from ws_version_info.h
rename to version_info.h
index 6877704cfd..564d9c183b 100644
--- a/ws_version_info.h
+++ b/version_info.h
@@ -1,4 +1,4 @@
-/* ws_version_info.h
+/* version_info.h
  * Declarations of routines to report version information for Wireshark
  * programs
  *
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 538994daef..c48fa1d5d1 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -51,7 +51,7 @@
 #endif
 #include <wsutil/report_message.h>
 #include <wsutil/unicode-utils.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/ex-opt.h>
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index be562b5a78..20a41de355 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -90,7 +90,7 @@ set(WIRETAP_FILES
 	vwr.c
 	wtap.c
 	wtap_opttypes.c
-	${CMAKE_SOURCE_DIR}/ws_version_info.c
+	${CMAKE_SOURCE_DIR}/version_info.c
 )
 
 set_source_files_properties(
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 1b67cb3adb..5448d47fdc 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -189,7 +189,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 libwiretap_la_SOURCES = \
 	$(NONGENERATED_C_FILES)		\
 	$(NONGENERATED_HEADER_FILES)	\
-	ws_version_info.c
+	version_info.c
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
@@ -215,13 +215,13 @@ CLEANFILES = \
 	*~
 
 DISTCLEANFILES = \
-	ws_version_info.c
+	version_info.c
 
 MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)	\
 	Makefile.in
 
-BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c
+BUILT_SOURCES = $(GENERATED_HEADER_FILES) version_info.c
 
 EXTRA_DIST = \
 	.editorconfig		\
@@ -244,7 +244,7 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
 	fi
 	$(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y
 
-ws_version_info.c: $(top_srcdir)/ws_version_info.c
+version_info.c: $(top_srcdir)/version_info.c
 	$(AM_V_LN_S)$(LN_S) $<
 
 # ABI compliance checker can be obtained from
diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c
index 2549270940..6c38572fb0 100644
--- a/wiretap/nettrace_3gpp_32_423.c
+++ b/wiretap/nettrace_3gpp_32_423.c
@@ -42,7 +42,7 @@
 #include <wsutil/buffer.h>
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 #include "wsutil/str_util.h"