diff --git a/capinfos.c b/capinfos.c
index c041762100..18cd9696b9 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -59,7 +59,7 @@
 
 #include <wiretap/wtap.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <cli_main.h>
diff --git a/capture_opts.c b/capture_opts.c
index 4750cddd19..16d44d1970 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -24,8 +24,8 @@
 #include "capture_opts.h"
 #include "ringbuffer.h"
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/ws_pipe.h>
 
diff --git a/captype.c b/captype.c
index b35728e26c..825f799329 100644
--- a/captype.c
+++ b/captype.c
@@ -28,7 +28,7 @@
 
 #include <wiretap/wtap.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/debian/libwsutil0.symbols b/debian/libwsutil0.symbols
index 427d0644f7..89062b29b8 100644
--- a/debian/libwsutil0.symbols
+++ b/debian/libwsutil0.symbols
@@ -7,9 +7,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
  ascii_strdown_inplace@Base 1.10.0
  ascii_strup_inplace@Base 1.10.0
  bitswap_buf_inplace@Base 1.12.0~rc1
- cmdarg_err@Base 1.99.0
- cmdarg_err_cont@Base 1.99.0
- cmdarg_err_init@Base 1.99.0
  config_file_exists_with_entries@Base 2.9.0
  copy_file_binary_mode@Base 1.12.0~rc1
  copy_persconffile_profile@Base 1.12.0~rc1
@@ -69,9 +66,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
  get_dirname@Base 1.12.0~rc1
  get_extcap_dir@Base 1.99.0
  get_global_profiles_dir@Base 1.12.0~rc1
- get_guint32@Base 2.3.0
- get_natural_int@Base 1.99.0
- get_nonzero_guint32@Base 2.3.0
  get_os_version_info@Base 1.99.0
  get_persconffile_path@Base 1.12.0~rc1
  get_persdatafile_dir@Base 1.12.0~rc1
@@ -79,8 +73,6 @@ libwsutil.so.0 libwsutil0 #MINVER#
  get_plugins_dir_with_version@Base 2.5.0
  get_plugins_pers_dir@Base 1.12.0~rc1
  get_plugins_pers_dir_with_version@Base 2.5.0
- get_positive_double@Base 2.9.0
- get_positive_int@Base 1.99.0
  get_profile_dir@Base 2.9.0
  get_profile_name@Base 1.12.0~rc1
  get_profiles_dir@Base 1.12.0~rc1
diff --git a/dumpcap.c b/dumpcap.c
index b893b9e51f..951328d481 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -40,7 +40,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/strtoi.h>
 #include <cli_main.h>
 #include <version_info.h>
@@ -69,7 +69,7 @@
 #include <sys/un.h>
 #endif
 
-#include <wsutil/clopts_common.h>
+#include <ui/clopts_common.h>
 #include <wsutil/privileges.h>
 
 #include "sync_pipe.h"
diff --git a/editcap.c b/editcap.c
index 0346cc9ca0..d8ede7b4d7 100644
--- a/editcap.c
+++ b/editcap.c
@@ -62,8 +62,8 @@
 # include "wsutil/strptime.h"
 #endif
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/wsgcrypt.h>
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 5b2d1dfcfa..56868f2014 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <wsutil/strtoi.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/inet_addr.h>
 
 #include "ui/failure_message.h"
diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
index 6eb19d601f..127d7f153c 100644
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -27,6 +27,7 @@ set(FUZZ_UDP_PORT_DISSECTORS dns dhcp)
 set(FUZZ_MEDIA_TYPE_DISSECTORS json)
 
 set(fuzzshark_LIBS
+	ui
 	wiretap
 	epan
 	${VERSION_INFO_LIBS}
diff --git a/fuzz/fuzzshark.c b/fuzz/fuzzshark.c
index d618b81121..ce754116e6 100644
--- a/fuzz/fuzzshark.c
+++ b/fuzz/fuzzshark.c
@@ -20,7 +20,7 @@
 
 #include <epan/epan.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
diff --git a/mergecap.c b/mergecap.c
index 6601f31d51..4b06014ef1 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -30,8 +30,8 @@
 #include <wsutil/wsgetopt.h>
 #endif
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/randpkt.c b/randpkt.c
index ce98df6a83..c70110116f 100644
--- a/randpkt.c
+++ b/randpkt.c
@@ -15,8 +15,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
diff --git a/rawshark.c b/rawshark.c
index 77e7fdb676..738b521e89 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -46,13 +46,13 @@
 #include <glib.h>
 #include <epan/epan.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/plugins.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <wsutil/clopts_common.h>
+#include <ui/clopts_common.h>
 
 #include "globals.h"
 #include <epan/packet.h>
diff --git a/reordercap.c b/reordercap.c
index c727db6e78..4507537f16 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -25,7 +25,7 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/sharkd.c b/sharkd.c
index 22d07fc7dd..7388df61b2 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -23,8 +23,8 @@
 #include <epan/exceptions.h>
 #include <epan/epan.h>
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/tfshark.c b/tfshark.c
index e6d71bcbed..9ce689ce8b 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -32,8 +32,8 @@
 #include <epan/exceptions.h>
 #include <epan/epan.h>
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/tshark.c b/tshark.c
index cbd9768a0a..98b08d0883 100644
--- a/tshark.c
+++ b/tshark.c
@@ -45,8 +45,8 @@
 #include <epan/exceptions.h>
 #include <epan/epan.h>
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index b73e73c746..60d9bc9b81 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -11,6 +11,8 @@ set(NONGENERATED_UI_SRC
 	alert_box.c
 	capture.c
 	capture_ui_utils.c
+	clopts_common.c
+	cmdarg_err.c
 	commandline.c
 	console.c
 	decode_as_utils.c
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index 4543b24d8e..f3d81269e6 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -24,7 +24,7 @@
 #include "epan/timestats.h"
 #include "epan/stat_tap_ui.h"
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_camelsrt(void);
 
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 26956ca993..f607ae2369 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 
 #include <wsutil/strtoi.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 #include <epan/packet_info.h>
 #include <epan/tap.h>
diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index 2becc36a79..6bf2e3c744 100644
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -18,7 +18,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 #include <epan/conversation_table.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _endpoints_t {
diff --git a/ui/cli/tap-exportobject.c b/ui/cli/tap-exportobject.c
index a8c7d48e95..b4d82d2698 100644
--- a/ui/cli/tap-exportobject.c
+++ b/ui/cli/tap-exportobject.c
@@ -18,7 +18,7 @@
 #include <string.h>
 
 #include <wsutil/file_util.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 #include <epan/packet_info.h>
 #include <epan/packet.h>
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 87339c23bf..00c45ab8da 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -21,7 +21,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_hosts(void);
 
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index 0df566ae21..184c0d98f2 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -22,7 +22,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-http.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_httpstat(void);
 
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index dca35a6f86..d1dfebb77f 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -28,7 +28,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_icmpstat(void);
 
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index ff51397557..04bcf973a8 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -29,7 +29,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_icmpv6stat(void);
 
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index b375bd38b7..3da2dae8e2 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/timestamp.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _io_users_t {
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index 4f6c6ee01a..e0c777b670 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -21,7 +21,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_protocolinfo(void);
 
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index fd51f03c88..8009874725 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -20,7 +20,7 @@
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_protohierstat(void);
 
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index 59d0292428..8581850b2e 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -25,7 +25,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rpc.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 #define MICROSECS_PER_SEC   1000000
 #define NANOSECS_PER_SEC    1000000000
diff --git a/ui/cli/tap-rtd.c b/ui/cli/tap-rtd.c
index d86fded52c..ecfb58d956 100644
--- a/ui/cli/tap-rtd.c
+++ b/ui/cli/tap-rtd.c
@@ -19,7 +19,7 @@
 #include <epan/rtd_table.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _rtd_t {
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index cc5d58547f..3db29ceaf6 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -25,7 +25,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rtsp.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_rtspstat(void);
 
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index 8ff1267380..cfb3d5376a 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -24,7 +24,7 @@
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/to_str.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_sctpstat(void);
 
diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index 9f7cce6ff6..5d03022c08 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -16,7 +16,7 @@
 #include <epan/packet.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 typedef struct _table_stat_t {
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index 1fd5fa7674..988da5a89a 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -24,7 +24,7 @@
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-sip.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_sipstat(void);
 
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index 0a87faffd8..039a5acc49 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -23,7 +23,7 @@
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-smb.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_smbsids(void);
 
diff --git a/ui/cli/tap-srt.c b/ui/cli/tap-srt.c
index b9820ff8e5..5231994467 100644
--- a/ui/cli/tap-srt.c
+++ b/ui/cli/tap-srt.c
@@ -17,7 +17,7 @@
 #include <epan/srt_table.h>
 #include <epan/timestamp.h>
 #include <epan/stat_tap_ui.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 #include <ui/cli/tshark-tap.h>
 
 #define NANOSECS_PER_SEC 1000000000
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index 3c434072cd..5899777711 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -22,7 +22,7 @@
 #include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-sv.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_sv(void);
 
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index f6ecd16cf1..3f8c21c8b3 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -27,7 +27,7 @@
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-wsp.h>
 
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 void register_tap_listener_wspstat(void);
 
diff --git a/wsutil/clopts_common.c b/ui/clopts_common.c
similarity index 97%
rename from wsutil/clopts_common.c
rename to ui/clopts_common.c
index 79d139a204..464ab18697 100644
--- a/wsutil/clopts_common.c
+++ b/ui/clopts_common.c
@@ -14,9 +14,9 @@
 #include <errno.h>
 
 #include <wsutil/strtoi.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
-#include <wsutil/clopts_common.h>
+#include "clopts_common.h"
 
 int
 get_natural_int(const char *string, const char *name)
diff --git a/wsutil/clopts_common.h b/ui/clopts_common.h
similarity index 72%
rename from wsutil/clopts_common.h
rename to ui/clopts_common.h
index 2cceb76577..6b8a6504a2 100644
--- a/wsutil/clopts_common.h
+++ b/ui/clopts_common.h
@@ -8,32 +8,30 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __WSUTIL_CLOPTS_COMMON_H__
-#define __WSUTIL_CLOPTS_COMMON_H__
-
-#include "ws_symbol_export.h"
+#ifndef __UI_CLOPTS_COMMON_H__
+#define __UI_CLOPTS_COMMON_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-WS_DLL_PUBLIC int
+extern int
 get_natural_int(const char *string, const char *name);
 
-WS_DLL_PUBLIC int
+extern int
 get_positive_int(const char *string, const char *name);
 
-WS_DLL_PUBLIC guint32
+extern guint32
 get_guint32(const char *string, const char *name);
 
-WS_DLL_PUBLIC guint32
+extern guint32
 get_nonzero_guint32(const char *string, const char *name);
 
-WS_DLL_PUBLIC double
+extern double
 get_positive_double(const char *string, const char *name);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __WSUTIL_CLOPTS_COMMON_H__ */
+#endif /* __UI_CLOPTS_COMMON_H__ */
diff --git a/wsutil/cmdarg_err.c b/ui/cmdarg_err.c
similarity index 97%
rename from wsutil/cmdarg_err.c
rename to ui/cmdarg_err.c
index e7368dd5db..889fa603c6 100644
--- a/wsutil/cmdarg_err.c
+++ b/ui/cmdarg_err.c
@@ -10,8 +10,7 @@
 
 #include "config.h"
 
-
-#include <wsutil/cmdarg_err.h>
+#include "cmdarg_err.h"
 
 static void (*print_err)(const char *, va_list ap);
 static void (*print_err_cont)(const char *, va_list ap);
diff --git a/wsutil/cmdarg_err.h b/ui/cmdarg_err.h
similarity index 81%
rename from wsutil/cmdarg_err.h
rename to ui/cmdarg_err.h
index 4e8816ad07..96328a0b66 100644
--- a/wsutil/cmdarg_err.h
+++ b/ui/cmdarg_err.h
@@ -8,15 +8,13 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __WSUTIL_CMDARG_ERR_H__
-#define __WSUTIL_CMDARG_ERR_H__
+#ifndef __UI_CMDARG_ERR_H__
+#define __UI_CMDARG_ERR_H__
 
 #include <stdarg.h>
 
 #include <glib.h>
 
-#include "ws_symbol_export.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -24,21 +22,21 @@ extern "C" {
 /*
  * Set the reporting functions for error messages.
  */
-WS_DLL_PUBLIC void
+extern void
 cmdarg_err_init(void (*err)(const char *, va_list),
                 void (*err_cont)(const char *, va_list));
 
 /*
  * Report an error in command-line arguments.
  */
-WS_DLL_PUBLIC void
+extern void
 cmdarg_err(const char *fmt, ...)
     G_GNUC_PRINTF(1, 2);
 
 /*
  * Report additional information for an error in command-line arguments.
  */
-WS_DLL_PUBLIC void
+extern void
 cmdarg_err_cont(const char *fmt, ...)
     G_GNUC_PRINTF(1, 2);
 
@@ -46,4 +44,4 @@ cmdarg_err_cont(const char *fmt, ...)
 }
 #endif /* __cplusplus */
 
-#endif /* __WSUTIL_CMDARG_ERR_H__ */
+#endif /* __UI_CMDARG_ERR_H__ */
diff --git a/ui/commandline.c b/ui/commandline.c
index fc3c375a03..7855661654 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -26,8 +26,8 @@
 
 #include <version_info.h>
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 
 #include <epan/ex-opt.h>
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 3315623c16..30ca1096e1 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -23,7 +23,7 @@
 
 #include "wsutil/file_util.h"
 #include "wsutil/filesystem.h"
-#include "wsutil/cmdarg_err.h"
+#include "ui/cmdarg_err.h"
 #include "version_info.h"
 
 /* XXX - We might want to switch this to a UAT */
diff --git a/ui/dissect_opts.c b/ui/dissect_opts.c
index c6aa77165c..bfcf1c928f 100644
--- a/ui/dissect_opts.c
+++ b/ui/dissect_opts.c
@@ -30,8 +30,8 @@
 #include <epan/dissectors/read_keytab_file.h>
 #endif
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/file_util.h>
 
 #include "ui/dissect_opts.h"
diff --git a/ui/failure_message.c b/ui/failure_message.c
index e75e2ce9bc..5a89c3caed 100644
--- a/ui/failure_message.c
+++ b/ui/failure_message.c
@@ -16,7 +16,7 @@
 
 #include <wiretap/wtap.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/cmdarg_err.h>
 
 #include "ui/failure_message.h"
 
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index a4c27a97fb..2b838c9105 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -28,8 +28,8 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
-#include <wsutil/clopts_common.h>
-#include <wsutil/cmdarg_err.h>
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #ifdef HAVE_PLUGINS
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index bb8f57a018..af103b3747 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -20,8 +20,6 @@ set(WSUTIL_PUBLIC_HEADERS
 	bits_ctz.h
 	bitswap.h
 	buffer.h
-	clopts_common.h
-	cmdarg_err.h
 	color.h
 	copyright_info.h
 	cpu_info.h
@@ -80,8 +78,6 @@ set(WSUTIL_COMMON_FILES
 	base32.c
 	bitswap.c
 	buffer.c
-	clopts_common.c
-	cmdarg_err.c
 	copyright_info.c
 	crash_info.c
 	crc10.c