46 files changed, 94 insertions, 118 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc2d491783..ebc42d736b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1466,8 +1466,7 @@ endif()
 set(PLUGIN_INSTALL_VERSION_LIBDIR "${PLUGIN_INSTALL_LIBDIR}/${PLUGIN_PATH_ID}")
 set(PLUGIN_VERSION_DIR "plugins/${PLUGIN_PATH_ID}")
 
-add_subdirectory( capchild )
-add_subdirectory( caputils )
+add_subdirectory( capture )
 add_subdirectory( doc )
 add_subdirectory( docbook EXCLUDE_FROM_ALL )
 add_subdirectory( epan )
diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt
deleted file mode 100644
index 5eba74a28d..0000000000
--- a/capchild/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# CMakeLists.txt
-
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-
-
-set(CAPCHILD_SRC
-	capture_ifinfo.c
-	capture_sync.c
-)
-
-set_source_files_properties(
-	${CAPCHILD_SRC}
-	PROPERTIES
-	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
-)
-
-file(GLOB CAPCHILD_HEADERS capture_session.h)
-
-add_library(capchild STATIC
-	${CAPCHILD_SRC}
-)
-
-target_link_libraries(capchild
-	PRIVATE
-		wsutil
-		$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
-)
-
-set_target_properties(capchild PROPERTIES
-	LINK_FLAGS "${WS_LINK_FLAGS}"
-	FOLDER "Libs")
-
-#
-# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
-#
-# Local variables:
-# c-basic-offset: 8
-# tab-width: 8
-# indent-tabs-mode: t
-# End:
-#
-# vi: set shiftwidth=8 tabstop=8 noexpandtab:
-# :indentSize=8:tabSize=8:noTabs=false:
-#
diff --git a/caputils/.editorconfig b/capture/.editorconfig
index 9411ef0157..9411ef0157 100644
--- a/caputils/.editorconfig
+++ b/capture/.editorconfig
diff --git a/caputils/CMakeLists.txt b/capture/CMakeLists.txt
index e65759f79e..57a94d78c7 100644
--- a/caputils/CMakeLists.txt
+++ b/capture/CMakeLists.txt
@@ -67,6 +67,33 @@ set_target_properties(caputils PROPERTIES
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "Libs")
 
+set(CAPCHILD_SRC
+	capture_ifinfo.c
+	capture_sync.c
+)
+
+set_source_files_properties(
+	${CAPCHILD_SRC}
+	PROPERTIES
+	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
+
+file(GLOB CAPCHILD_HEADERS capture_session.h)
+
+add_library(capchild STATIC
+	${CAPCHILD_SRC}
+)
+
+target_link_libraries(capchild
+	PRIVATE
+		wsutil
+		$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
+)
+
+set_target_properties(capchild PROPERTIES
+	LINK_FLAGS "${WS_LINK_FLAGS}"
+	FOLDER "Libs")
+
 CHECKAPI(
 	NAME
 	  caputils-base
diff --git a/caputils/airpcap.h b/capture/airpcap.h
index 9ca0688834..9ca0688834 100644
--- a/caputils/airpcap.h
+++ b/capture/airpcap.h
diff --git a/caputils/airpcap_loader.c b/capture/airpcap_loader.c
index 191e8a7e19..4e83953fdb 100644
--- a/caputils/airpcap_loader.c
+++ b/capture/airpcap_loader.c
@@ -19,8 +19,8 @@
 #include <wsutil/file_util.h>
 #include <wsutil/802_11-utils.h>
 
-#include <caputils/airpcap.h>
-#include <caputils/airpcap_loader.h>
+#include <capture/airpcap.h>
+#include <capture/airpcap_loader.h>
 
 
 /*
diff --git a/caputils/airpcap_loader.h b/capture/airpcap_loader.h
index c1d612bd9f..c1d612bd9f 100644
--- a/caputils/airpcap_loader.h
+++ b/capture/airpcap_loader.h
diff --git a/caputils/capture-pcap-util-int.h b/capture/capture-pcap-util-int.h
index efeb467409..efeb467409 100644
--- a/caputils/capture-pcap-util-int.h
+++ b/capture/capture-pcap-util-int.h
diff --git a/caputils/capture-pcap-util-unix.c b/capture/capture-pcap-util-unix.c
index 936de1ce50..b83888e849 100644
--- a/caputils/capture-pcap-util-unix.c
+++ b/capture/capture-pcap-util-unix.c
@@ -22,9 +22,9 @@
 # include <sys/capability.h>
 #endif
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #ifdef HAVE_PCAP_REMOTE
 GList *
diff --git a/caputils/capture-pcap-util.c b/capture/capture-pcap-util.c
index 364762f2da..5f8377a688 100644
--- a/caputils/capture-pcap-util.c
+++ b/capture/capture-pcap-util.c
@@ -64,9 +64,9 @@
 
 #endif /* defined(HAVE_PCAP_CREATE) && defined(__linux__) */
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #include "log.h"
 
@@ -78,7 +78,7 @@
 #endif
 
 #ifdef _WIN32
-#include "caputils/capture_win_ifnames.h" /* windows friendly interface names */
+#include "capture/capture_win_ifnames.h" /* windows friendly interface names */
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
diff --git a/caputils/capture-pcap-util.h b/capture/capture-pcap-util.h
index 33c87c2542..33c87c2542 100644
--- a/caputils/capture-pcap-util.h
+++ b/capture/capture-pcap-util.h
diff --git a/caputils/capture-wpcap.c b/capture/capture-wpcap.c
index 064b939ba3..c3d8fdfea4 100644
--- a/caputils/capture-wpcap.c
+++ b/capture/capture-wpcap.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 
 gboolean has_wpcap = FALSE;
 
@@ -30,9 +30,9 @@ gboolean has_wpcap = FALSE;
 
 #include <epan/strutil.h>
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #include <wsutil/file_util.h>
 
diff --git a/caputils/capture-wpcap.h b/capture/capture-wpcap.h
index 3e18a79de4..3e18a79de4 100644
--- a/caputils/capture-wpcap.h
+++ b/capture/capture-wpcap.h
diff --git a/capchild/capture_ifinfo.c b/capture/capture_ifinfo.c
index a7dc7b7649..d8f2d33bc9 100644
--- a/capchild/capture_ifinfo.c
+++ b/capture/capture_ifinfo.c
@@ -20,12 +20,12 @@
 
 #include "capture_opts.h"
 
-#include "capchild/capture_session.h"
-#include "capchild/capture_sync.h"
+#include "capture/capture_session.h"
+#include "capture/capture_sync.h"
 #include "extcap.h"
 #include "log.h"
 
-#include <caputils/capture_ifinfo.h>
+#include <capture/capture_ifinfo.h>
 #include <wsutil/inet_addr.h>
 
 #ifdef HAVE_PCAP_REMOTE
diff --git a/caputils/capture_ifinfo.h b/capture/capture_ifinfo.h
index 5034ddb720..5034ddb720 100644
--- a/caputils/capture_ifinfo.h
+++ b/capture/capture_ifinfo.h
diff --git a/capchild/capture_session.h b/capture/capture_session.h
index 36773a5daf..36773a5daf 100644
--- a/capchild/capture_session.h
+++ b/capture/capture_session.h
diff --git a/capchild/capture_sync.c b/capture/capture_sync.c
index 937e411ed7..afd9f47778 100644
--- a/capchild/capture_sync.c
+++ b/capture/capture_sync.c
@@ -31,7 +31,7 @@
 # include <sys/wait.h>
 #endif
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #ifndef _WIN32
 /*
@@ -67,12 +67,12 @@
 #include "file.h"
 
 #include "ui/capture.h"
-#include <capchild/capture_sync.h>
+#include <capture/capture_sync.h>
 
 #include "sync_pipe.h"
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/ws_ui_util.h"
diff --git a/capchild/capture_sync.h b/capture/capture_sync.h
index b2c6751eff..b2c6751eff 100644
--- a/capchild/capture_sync.h
+++ b/capture/capture_sync.h
diff --git a/caputils/capture_win_ifnames.c b/capture/capture_win_ifnames.c
index 786d11a264..90cc1cbffd 100644
--- a/caputils/capture_win_ifnames.c
+++ b/capture/capture_win_ifnames.c
@@ -33,8 +33,8 @@
 
 #include "log.h"
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture_win_ifnames.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture_win_ifnames.h"
 
 #include <wsutil/file_util.h>
 
diff --git a/caputils/capture_win_ifnames.h b/capture/capture_win_ifnames.h
index 9289d2499f..9289d2499f 100644
--- a/caputils/capture_win_ifnames.h
+++ b/capture/capture_win_ifnames.h
diff --git a/caputils/iface_monitor.c b/capture/iface_monitor.c
index 6d79829143..6791a60103 100644
--- a/caputils/iface_monitor.c
+++ b/capture/iface_monitor.c
@@ -12,7 +12,7 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include <caputils/iface_monitor.h>
+#include <capture/iface_monitor.h>
 #include "ws_attributes.h"
 
 #if defined(HAVE_LIBNL)
diff --git a/caputils/iface_monitor.h b/capture/iface_monitor.h
index 785ab34a63..785ab34a63 100644
--- a/caputils/iface_monitor.h
+++ b/capture/iface_monitor.h
diff --git a/caputils/ws80211_utils.c b/capture/ws80211_utils.c
index 6c34b8e929..6c34b8e929 100644
--- a/caputils/ws80211_utils.c
+++ b/capture/ws80211_utils.c
diff --git a/caputils/ws80211_utils.h b/capture/ws80211_utils.h
index cc945ce69a..cc945ce69a 100644
--- a/caputils/ws80211_utils.h
+++ b/capture/ws80211_utils.h
diff --git a/capture_opts.c b/capture_opts.c
index b40d329f96..6b0538d46f 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -29,8 +29,8 @@
 #include <wsutil/file_util.h>
 #include <wsutil/ws_pipe.h>
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
 
 #include "ui/filter_files.h"
 
diff --git a/capture_opts.h b/capture_opts.h
index 825c3256fa..785cb5a21f 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -20,7 +20,7 @@
 
 #include <sys/types.h>     /* for gid_t */
 
-#include <caputils/capture_ifinfo.h>
+#include <capture/capture_ifinfo.h>
 #include "ringbuffer.h"
 
 #ifdef _WIN32
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake
index 75e49449e7..62704a1ee4 100644
--- a/cmake/modules/FindPCAP.cmake
+++ b/cmake/modules/FindPCAP.cmake
@@ -112,7 +112,7 @@ find_path(PCAP_INCLUDE_DIR
 )
 
 # On Windows we load wpcap.dll explicitly and probe its functions in
-# caputils\capture-wpcap.c. We don't want to link with pcap.lib since
+# capture\capture-wpcap.c. We don't want to link with pcap.lib since
 # that would bring in the non-capturing (null) pcap.dll from the vcpkg
 # library.
 if(WIN32)
diff --git a/docbook/wsdg_src/WSDG_chapter_build_intro.adoc b/docbook/wsdg_src/WSDG_chapter_build_intro.adoc
index c8d9a9b8f7..652c9390d8 100644
--- a/docbook/wsdg_src/WSDG_chapter_build_intro.adoc
+++ b/docbook/wsdg_src/WSDG_chapter_build_intro.adoc
@@ -16,7 +16,7 @@ _/plugins/epan/{asterisk}_ directories
 * Capture file I/O - using Wireshark’s own wiretap library
 
 * Capture - using the libpcap and Npcap libraries, in _dumpcap.c_ and
-the _/capchild_ and _/caputils directories
+the _/capture_ directory
 
 * User interface - using Qt and associated libraries
 
diff --git a/dumpcap.c b/dumpcap.c
index e7e976b77d..84c2889788 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -55,11 +55,11 @@
 
 #include "ringbuffer.h"
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 
 #include "writecap/pcapio.h"
@@ -74,8 +74,8 @@
 #include "sync_pipe.h"
 
 #include "capture_opts.h"
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 
 #include "wsutil/tempfile.h"
 #include "log.h"
@@ -88,7 +88,7 @@
 #include "wsutil/please_report_bug.h"
 #include "wsutil/glib-compat.h"
 
-#include "caputils/ws80211_utils.h"
+#include "capture/ws80211_utils.h"
 
 #include "extcap.h"
 
diff --git a/rawshark.c b/rawshark.c
index 8e3d2fa33d..8252a3666f 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -91,14 +91,14 @@
 #include <cli_main.h>
 #include <version_info.h>
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #include "extcap.h"
 
 #ifdef HAVE_LIBPCAP
 #include <setjmp.h>
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
 #include "log.h"
diff --git a/tshark.c b/tshark.c
index dcf85d0145..7f85843169 100644
--- a/tshark.c
+++ b/tshark.c
@@ -101,15 +101,15 @@
 
 #include "capture_opts.h"
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #ifdef HAVE_LIBPCAP
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 #include <ui/capture_info.h>
 #endif /* HAVE_LIBPCAP */
 #include "log.h"
diff --git a/ui/capture.c b/ui/capture.c
index bc16806a55..0410550e08 100644
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -22,17 +22,17 @@
 #include <epan/dfilter/dfilter.h>
 #include "file.h"
 #include "ui/capture.h"
-#include "caputils/capture_ifinfo.h"
-#include <capchild/capture_sync.h>
+#include "capture/capture_ifinfo.h"
+#include <capture/capture_sync.h>
 #include "ui/capture_info.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/util.h"
 #include "ui/urls.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include <epan/prefs.h>
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/simple_dialog.h"
diff --git a/ui/capture.h b/ui/capture.h
index 70a70b9a27..2f6c55f40e 100644
--- a/ui/capture.h
+++ b/ui/capture.h
@@ -20,7 +20,7 @@
 #include "capture_opts.h"
 #include "capture_info.h"
 #include "cfile.h"
-#include "capchild/capture_session.h"
+#include "capture/capture_session.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ui/capture_info.h b/ui/capture_info.h
index 21b5149d7a..ea11895ded 100644
--- a/ui/capture_info.h
+++ b/ui/capture_info.h
@@ -19,7 +19,7 @@
 #define __CAPTURE_INFO_H__
 
 #include "capture_opts.h"
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 #include <epan/capture_dissectors.h>
 
 #ifdef __cplusplus
diff --git a/ui/capture_ui_utils.c b/ui/capture_ui_utils.c
index 21acf8dfcc..6e2d0dbe92 100644
--- a/ui/capture_ui_utils.c
+++ b/ui/capture_ui_utils.c
@@ -19,7 +19,7 @@
 
 #include "epan/prefs.h"
 #include "epan/ex-opt.h"
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "wiretap/wtap.h"
diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
index bb2aa9317c..7b3e4317f7 100644
--- a/ui/qt/interface_frame.cpp
+++ b/ui/qt/interface_frame.cpp
@@ -11,10 +11,10 @@
 #include "config.h"
 #include <ui_interface_frame.h>
 
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 
 #ifdef Q_OS_WIN
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/qt/interface_frame.h"
@@ -362,7 +362,7 @@ void InterfaceFrame::resetInterfaceTreeDisplay()
     }
 }
 
-// XXX Should this be in caputils/capture-pcap-util.[ch]?
+// XXX Should this be in capture/capture-pcap-util.[ch]?
 bool InterfaceFrame::haveLocalCapturePermissions() const
 {
 #ifdef Q_OS_MAC
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index f15eaab867..8ddd0643bc 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -101,19 +101,19 @@
 #include <ui/qt/widgets/splash_overlay.h>
 #include "ui/qt/wireshark_application.h"
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #include <QMessageBox>
 #include <QScreen>
 
 #ifdef _WIN32
-#  include "caputils/capture-wpcap.h"
+#  include "capture/capture-wpcap.h"
 #  include <wsutil/file_util.h>
 #endif /* _WIN32 */
 
 #ifdef HAVE_AIRPCAP
-#  include <caputils/airpcap.h>
-#  include <caputils/airpcap_loader.h>
+#  include <capture/airpcap.h>
+#  include <capture/airpcap_loader.h>
 //#  include "airpcap_dlg.h"
 //#  include "airpcap_gui_utils.h"
 #endif
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index 369e13f0af..de457b7160 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -14,7 +14,7 @@
 
 #include "cfile.h"
 
-#include "capchild/capture_session.h"
+#include "capture/capture_session.h"
 
 #include <ui/qt/utils/field_information.h>
 #include <ui/qt/widgets/label_stack.h>
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 86359d08e6..e5d945255f 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -31,7 +31,7 @@ DIAG_ON(frame-larger-than=)
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 #endif
 
 #include "ui/alert_box.h"
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 57a16aa25b..91265bad1e 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -54,7 +54,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture_opts.h"
 #endif
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 
 #include <QMainWindow>
 #include <QPointer>
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 73d3588341..9dcc486c0d 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -21,7 +21,7 @@
 #ifdef HAVE_PCAP_REMOTE
 #include "ui/qt/remote_capture_dialog.h"
 #include "ui/qt/remote_settings_dialog.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "ui/recent.h"
 #endif
 #include "ui/iface_lists.h"
diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp
index 63a2680ec4..0eef6d1432 100644
--- a/ui/qt/models/interface_tree_model.cpp
+++ b/ui/qt/models/interface_tree_model.cpp
@@ -14,7 +14,7 @@
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "capture_opts.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp
index 3781721158..d44a94c348 100644
--- a/ui/qt/models/pref_models.cpp
+++ b/ui/qt/models/pref_models.cpp
@@ -13,7 +13,7 @@
 
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
 
diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
index daa759958f..59043b075c 100644
--- a/ui/qt/remote_capture_dialog.cpp
+++ b/ui/qt/remote_capture_dialog.cpp
@@ -17,7 +17,7 @@
 #include "remote_capture_dialog.h"
 #include <ui_remote_capture_dialog.h>
 #include "capture_opts.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "ui/capture_ui_utils.h"
 #include "epan/prefs.h"
 #include "epan/to_str.h"
diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp
index 8df048da4d..31cd22aa3f 100644
--- a/ui/qt/wireless_frame.cpp
+++ b/ui/qt/wireless_frame.cpp
@@ -14,10 +14,10 @@
 
 #include <glib.h>
 
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 
-#include <caputils/ws80211_utils.h>
+#include <capture/ws80211_utils.h>
 
 #include "ui/ws_ui_util.h"
 #include <wsutil/utf8_entities.h>
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 63b51921c3..cc7b8e68f8 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -48,7 +48,7 @@
 
 #include "extcap.h"
 #ifdef HAVE_LIBPCAP
-#include <caputils/iface_monitor.h>
+#include <capture/iface_monitor.h>
 #endif
 
 #include "ui/filter_files.h"