diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 23e5656788..bd5306ede4 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -108,6 +108,8 @@ qt_internal_add_module(Core
         global/q23functional.h
         global/qxpfunctional.h
         global/qxptype_traits.h
+        ipc/qsharedmemory.cpp ipc/qsharedmemory.h ipc/qsharedmemory_p.h
+        ipc/qsystemsemaphore.cpp ipc/qsystemsemaphore.h ipc/qsystemsemaphore_p.h
         io/qabstractfileengine.cpp io/qabstractfileengine_p.h
         io/qbuffer.cpp io/qbuffer.h
         io/qdataurl.cpp io/qdataurl_p.h
@@ -174,11 +176,9 @@ qt_internal_add_module(Core
         kernel/qproperty.cpp kernel/qproperty.h kernel/qproperty_p.h
         kernel/qpropertyprivate.h
         kernel/qsequentialiterable.cpp kernel/qsequentialiterable.h
-        kernel/qsharedmemory.cpp kernel/qsharedmemory.h kernel/qsharedmemory_p.h
         kernel/qsignalmapper.cpp kernel/qsignalmapper.h
         kernel/qsocketnotifier.cpp kernel/qsocketnotifier.h
         kernel/qsystemerror.cpp kernel/qsystemerror_p.h
-        kernel/qsystemsemaphore.cpp kernel/qsystemsemaphore.h kernel/qsystemsemaphore_p.h
         kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
         kernel/qtimer.cpp kernel/qtimer.h kernel/qtimer_p.h
         kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
@@ -508,8 +508,8 @@ qt_internal_extend_target(Core
 
 qt_internal_extend_target(Core CONDITION ANDROID
     SOURCES
-        kernel/qsharedmemory_android.cpp
-        kernel/qsystemsemaphore_android.cpp
+        ipc/qsharedmemory_android.cpp
+        ipc/qsystemsemaphore_android.cpp
     DEFINES
         LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case
 )
@@ -565,8 +565,8 @@ qt_internal_extend_target(Core CONDITION WIN32
         kernel/qelapsedtimer_win.cpp
         kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
         kernel/qfunctions_win.cpp kernel/qfunctions_win_p.h kernel/qfunctions_winrt_p.h
-        kernel/qsharedmemory_win.cpp
-        kernel/qsystemsemaphore_win.cpp
+        ipc/qsharedmemory_win.cpp
+        ipc/qsystemsemaphore_win.cpp
         kernel/qwineventnotifier.cpp kernel/qwineventnotifier.h kernel/qwineventnotifier_p.h
         kernel/qwinregistry.cpp kernel/qwinregistry_p.h
         plugin/qsystemlibrary.cpp plugin/qsystemlibrary_p.h
@@ -1139,12 +1139,12 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
 
 qt_internal_extend_target(Core CONDITION UNIX AND NOT ANDROID
     SOURCES
-        kernel/qsharedmemory_posix.cpp
-        kernel/qsharedmemory_systemv.cpp
-        kernel/qsharedmemory_unix.cpp
-        kernel/qsystemsemaphore_posix.cpp
-        kernel/qsystemsemaphore_systemv.cpp
-        kernel/qsystemsemaphore_unix.cpp
+        ipc/qsharedmemory_posix.cpp
+        ipc/qsharedmemory_systemv.cpp
+        ipc/qsharedmemory_unix.cpp
+        ipc/qsystemsemaphore_posix.cpp
+        ipc/qsystemsemaphore_systemv.cpp
+        ipc/qsystemsemaphore_unix.cpp
 )
 
 qt_internal_extend_target(Core CONDITION VXWORKS
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/ipc/qsharedmemory.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory.cpp
rename to src/corelib/ipc/qsharedmemory.cpp
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/ipc/qsharedmemory.h
similarity index 100%
rename from src/corelib/kernel/qsharedmemory.h
rename to src/corelib/ipc/qsharedmemory.h
diff --git a/src/corelib/kernel/qsharedmemory_android.cpp b/src/corelib/ipc/qsharedmemory_android.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_android.cpp
rename to src/corelib/ipc/qsharedmemory_android.cpp
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/ipc/qsharedmemory_p.h
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_p.h
rename to src/corelib/ipc/qsharedmemory_p.h
diff --git a/src/corelib/kernel/qsharedmemory_posix.cpp b/src/corelib/ipc/qsharedmemory_posix.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_posix.cpp
rename to src/corelib/ipc/qsharedmemory_posix.cpp
diff --git a/src/corelib/kernel/qsharedmemory_systemv.cpp b/src/corelib/ipc/qsharedmemory_systemv.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_systemv.cpp
rename to src/corelib/ipc/qsharedmemory_systemv.cpp
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/ipc/qsharedmemory_unix.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_unix.cpp
rename to src/corelib/ipc/qsharedmemory_unix.cpp
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/ipc/qsharedmemory_win.cpp
similarity index 100%
rename from src/corelib/kernel/qsharedmemory_win.cpp
rename to src/corelib/ipc/qsharedmemory_win.cpp
diff --git a/src/corelib/kernel/qsystemsemaphore.cpp b/src/corelib/ipc/qsystemsemaphore.cpp
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore.cpp
rename to src/corelib/ipc/qsystemsemaphore.cpp
diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/ipc/qsystemsemaphore.h
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore.h
rename to src/corelib/ipc/qsystemsemaphore.h
diff --git a/src/corelib/kernel/qsystemsemaphore_android.cpp b/src/corelib/ipc/qsystemsemaphore_android.cpp
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore_android.cpp
rename to src/corelib/ipc/qsystemsemaphore_android.cpp
diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/ipc/qsystemsemaphore_p.h
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore_p.h
rename to src/corelib/ipc/qsystemsemaphore_p.h
diff --git a/src/corelib/kernel/qsystemsemaphore_posix.cpp b/src/corelib/ipc/qsystemsemaphore_posix.cpp
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore_posix.cpp
rename to src/corelib/ipc/qsystemsemaphore_posix.cpp
diff --git a/src/corelib/kernel/qsystemsemaphore_systemv.cpp b/src/corelib/ipc/qsystemsemaphore_systemv.cpp
similarity index 99%
rename from src/corelib/kernel/qsystemsemaphore_systemv.cpp
rename to src/corelib/ipc/qsystemsemaphore_systemv.cpp
index 28992a0fb4..f22c822979 100644
--- a/src/corelib/kernel/qsystemsemaphore_systemv.cpp
+++ b/src/corelib/ipc/qsystemsemaphore_systemv.cpp
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #if defined(Q_OS_DARWIN)
-#include "qcore_mac_p.h"
+#include "private/qcore_mac_p.h"
 #endif
 
 #include "private/qcore_unix_p.h"
diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/ipc/qsystemsemaphore_unix.cpp
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore_unix.cpp
rename to src/corelib/ipc/qsystemsemaphore_unix.cpp
diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/ipc/qsystemsemaphore_win.cpp
similarity index 100%
rename from src/corelib/kernel/qsystemsemaphore_win.cpp
rename to src/corelib/ipc/qsystemsemaphore_win.cpp
diff --git a/tests/auto/corelib/CMakeLists.txt b/tests/auto/corelib/CMakeLists.txt
index fe0c13dbbb..6a52b03e9a 100644
--- a/tests/auto/corelib/CMakeLists.txt
+++ b/tests/auto/corelib/CMakeLists.txt
@@ -8,6 +8,7 @@ if(NOT UIKIT)
     add_subdirectory(animation)
     add_subdirectory(global)
     add_subdirectory(io)
+    add_subdirectory(ipc)
     add_subdirectory(itemmodels)
     add_subdirectory(mimetypes)
     add_subdirectory(plugin)
diff --git a/tests/auto/corelib/ipc/CMakeLists.txt b/tests/auto/corelib/ipc/CMakeLists.txt
new file mode 100644
index 0000000000..e6e50e77e6
--- /dev/null
+++ b/tests/auto/corelib/ipc/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (C) 2022 Intel Corporation.
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(NOT ANDROID AND NOT UIKIT)
+    if(QT_FEATURE_private_tests)
+        add_subdirectory(qsharedmemory)
+    endif()
+    if(QT_FEATURE_systemsemaphore)
+        add_subdirectory(qsystemsemaphore)
+    endif()
+endif()
diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/ipc/qsharedmemory/CMakeLists.txt
similarity index 100%
rename from tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
rename to tests/auto/corelib/ipc/qsharedmemory/CMakeLists.txt
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/ipc/qsharedmemory/producerconsumer/CMakeLists.txt
similarity index 100%
rename from tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
rename to tests/auto/corelib/ipc/qsharedmemory/producerconsumer/CMakeLists.txt
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/main.cpp b/tests/auto/corelib/ipc/qsharedmemory/producerconsumer/main.cpp
similarity index 100%
rename from tests/auto/corelib/kernel/qsharedmemory/producerconsumer/main.cpp
rename to tests/auto/corelib/ipc/qsharedmemory/producerconsumer/main.cpp
diff --git a/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
similarity index 100%
rename from tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp
rename to tests/auto/corelib/ipc/qsharedmemory/tst_qsharedmemory.cpp
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/ipc/qsystemsemaphore/CMakeLists.txt
similarity index 100%
rename from tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
rename to tests/auto/corelib/ipc/qsystemsemaphore/CMakeLists.txt
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/ipc/qsystemsemaphore/acquirerelease/CMakeLists.txt
similarity index 100%
rename from tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
rename to tests/auto/corelib/ipc/qsystemsemaphore/acquirerelease/CMakeLists.txt
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/main.cpp b/tests/auto/corelib/ipc/qsystemsemaphore/acquirerelease/main.cpp
similarity index 100%
rename from tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/main.cpp
rename to tests/auto/corelib/ipc/qsystemsemaphore/acquirerelease/main.cpp
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
similarity index 100%
rename from tests/auto/corelib/kernel/qsystemsemaphore/tst_qsystemsemaphore.cpp
rename to tests/auto/corelib/ipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt
index f68a12869c..46a4e7d72e 100644
--- a/tests/auto/corelib/kernel/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/CMakeLists.txt
@@ -34,15 +34,9 @@ endif()
 if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)
     add_subdirectory(qobject)
 endif()
-if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT)
-    add_subdirectory(qsharedmemory)
-endif()
 if(QT_FEATURE_private_tests AND TARGET Qt::Network)
     add_subdirectory(qsocketnotifier)
 endif()
-if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT)
-    add_subdirectory(qsystemsemaphore)
-endif()
 if(WIN32)
     add_subdirectory(qwineventnotifier)
     add_subdirectory(qwinregistrykey)