diff --git a/ext/libstrawberry-common/CMakeLists.txt b/ext/libstrawberry-common/CMakeLists.txt
index 540a67145..72134f9eb 100644
--- a/ext/libstrawberry-common/CMakeLists.txt
+++ b/ext/libstrawberry-common/CMakeLists.txt
@@ -14,10 +14,6 @@ set(HEADERS
   core/workerpool.h
 )
 
-if(APPLE)
-  list(APPEND SOURCES core/scoped_nsautorelease_pool.mm)
-endif(APPLE)
-
 if(BUILD_WITH_QT6)
   qt6_wrap_cpp(MOC ${HEADERS})
 else()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f0e8ec03..70f89aee8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -936,6 +936,7 @@ optional_source(HAVE_AUDIOCD
 # Platform specific - macOS
 optional_source(APPLE
   SOURCES
+    core/scoped_nsautorelease_pool.mm
     core/mac_utilities.mm
     core/mac_startup.mm
     core/macsystemtrayicon.mm
diff --git a/ext/libstrawberry-common/core/arraysize.h b/src/core/arraysize.h
similarity index 100%
rename from ext/libstrawberry-common/core/arraysize.h
rename to src/core/arraysize.h
diff --git a/ext/libstrawberry-common/core/lazy.h b/src/core/lazy.h
similarity index 100%
rename from ext/libstrawberry-common/core/lazy.h
rename to src/core/lazy.h
diff --git a/ext/libstrawberry-common/core/scoped_nsautorelease_pool.h b/src/core/scoped_nsautorelease_pool.h
similarity index 100%
rename from ext/libstrawberry-common/core/scoped_nsautorelease_pool.h
rename to src/core/scoped_nsautorelease_pool.h
diff --git a/ext/libstrawberry-common/core/scoped_nsautorelease_pool.mm b/src/core/scoped_nsautorelease_pool.mm
similarity index 100%
rename from ext/libstrawberry-common/core/scoped_nsautorelease_pool.mm
rename to src/core/scoped_nsautorelease_pool.mm