diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index f2da2c2b109..92bf04d7809 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -308,6 +308,7 @@ qt_internal_add_module(Core
         tools/qvector.h
         tools/qversionnumber.cpp tools/qversionnumber.h
     NO_UNITY_BUILD_SOURCES
+        tools/qfreelist.cpp # Size0/Offset0 (also in qabstracteventdispatcher.cpp)
         # MinGW complains about `free-nonheap-object` in ~QSharedDataPointer()
         # despite the fact that appropriate checks are in place to avoid that!
         tools/qshareddata.cpp tools/qshareddata.h
@@ -318,6 +319,7 @@ qt_internal_add_module(Core
         text/qstringconverter.cpp # enum Data
         tools/qcryptographichash.cpp # KeccakNISTInterface/Final
         io/qdebug.cpp # undef qDebug
+        io/qsettings.cpp # Space (also in qjsonparser.cpp)
     NO_PCH_SOURCES
         compat/removed_api.cpp
         global/qsimd.cpp
@@ -1148,6 +1150,8 @@ qt_internal_extend_target(Core CONDITION VXWORKS
 qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
     SOURCES
         serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+    NO_UNITY_BUILD_SOURCES
+        serialization/qcborstreamreader.cpp # some problem with cbor_value_get_type etc
 )
 
 qt_internal_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter