diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 4e0d1600..7a2f6fda 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -2,7 +2,29 @@ add_library(plugins-common STATIC EXCLUDE_FROM_ALL
     "common/plugin/MessageUtils.h"
     "common/plugin/MessageUtils.cpp"
     "common/plugin/InstrumentDescription.h"
-    "common/plugin/InstrumentDescription.cpp")
+    "common/plugin/InstrumentDescription.cpp"
+    "common/plugin/NativeHelpers.h"
+    "common/plugin/NativeHelpers.cpp"
+    "common/plugin/SfizzFileScan.h"
+    "common/plugin/SfizzFileScan.cpp"
+    "common/plugin/FileTrie.h"
+    "common/plugin/FileTrie.cpp"
+    "common/plugin/SfizzForeignPaths.h"
+    "common/plugin/SfizzForeignPaths.cpp"
+    "common/plugin/SfizzSettings.h"
+    "common/plugin/SfizzSettings.cpp")
+if(APPLE)
+    target_sources(plugins-common PRIVATE
+        "common/plugin/SfizzForeignPaths.mm"
+        "common/plugin/SfizzSettings.mm"
+        "common/plugin/NativeHelpers.mm")
+    set_property(
+        SOURCE "common/plugin/SfizzForeignPaths.mm"
+               "common/plugin/SfizzSettings.mm"
+               "common/plugin/NativeHelpers.mm"
+        APPEND_STRING
+        PROPERTY COMPILE_FLAGS " -fobjc-arc")
+endif()
 target_include_directories(plugins-common PUBLIC "common")
 target_link_libraries(plugins-common
     PUBLIC sfizz::spin_mutex
@@ -10,6 +32,16 @@ target_link_libraries(plugins-common
     PRIVATE sfizz::internal sfizz::sfizz)
 add_library(sfizz::plugins-common ALIAS plugins-common)
 
+# Link system dependencies
+if(WIN32)
+elseif(APPLE)
+else()
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(GLIB REQUIRED glib-2.0)
+    target_include_directories(plugins-common PRIVATE ${GLIB_INCLUDE_DIRS})
+    target_link_libraries(plugins-common PRIVATE ${GLIB_LIBRARIES})
+endif()
+
 if((SFIZZ_LV2 AND SFIZZ_LV2_UI) OR SFIZZ_VST)
     add_subdirectory(editor)
 endif()
diff --git a/plugins/vst/FileTrie.cpp b/plugins/common/plugin/FileTrie.cpp
similarity index 100%
rename from plugins/vst/FileTrie.cpp
rename to plugins/common/plugin/FileTrie.cpp
diff --git a/plugins/vst/FileTrie.h b/plugins/common/plugin/FileTrie.h
similarity index 100%
rename from plugins/vst/FileTrie.h
rename to plugins/common/plugin/FileTrie.h
diff --git a/plugins/vst/NativeHelpers.cpp b/plugins/common/plugin/NativeHelpers.cpp
similarity index 100%
rename from plugins/vst/NativeHelpers.cpp
rename to plugins/common/plugin/NativeHelpers.cpp
diff --git a/plugins/vst/NativeHelpers.h b/plugins/common/plugin/NativeHelpers.h
similarity index 100%
rename from plugins/vst/NativeHelpers.h
rename to plugins/common/plugin/NativeHelpers.h
diff --git a/plugins/vst/NativeHelpers.mm b/plugins/common/plugin/NativeHelpers.mm
similarity index 100%
rename from plugins/vst/NativeHelpers.mm
rename to plugins/common/plugin/NativeHelpers.mm
diff --git a/plugins/vst/SfizzFileScan.cpp b/plugins/common/plugin/SfizzFileScan.cpp
similarity index 100%
rename from plugins/vst/SfizzFileScan.cpp
rename to plugins/common/plugin/SfizzFileScan.cpp
diff --git a/plugins/vst/SfizzFileScan.h b/plugins/common/plugin/SfizzFileScan.h
similarity index 100%
rename from plugins/vst/SfizzFileScan.h
rename to plugins/common/plugin/SfizzFileScan.h
diff --git a/plugins/vst/SfizzForeignPaths.cpp b/plugins/common/plugin/SfizzForeignPaths.cpp
similarity index 100%
rename from plugins/vst/SfizzForeignPaths.cpp
rename to plugins/common/plugin/SfizzForeignPaths.cpp
diff --git a/plugins/vst/SfizzForeignPaths.h b/plugins/common/plugin/SfizzForeignPaths.h
similarity index 100%
rename from plugins/vst/SfizzForeignPaths.h
rename to plugins/common/plugin/SfizzForeignPaths.h
diff --git a/plugins/vst/SfizzForeignPaths.mm b/plugins/common/plugin/SfizzForeignPaths.mm
similarity index 100%
rename from plugins/vst/SfizzForeignPaths.mm
rename to plugins/common/plugin/SfizzForeignPaths.mm
diff --git a/plugins/vst/SfizzSettings.cpp b/plugins/common/plugin/SfizzSettings.cpp
similarity index 100%
rename from plugins/vst/SfizzSettings.cpp
rename to plugins/common/plugin/SfizzSettings.cpp
diff --git a/plugins/vst/SfizzSettings.h b/plugins/common/plugin/SfizzSettings.h
similarity index 100%
rename from plugins/vst/SfizzSettings.h
rename to plugins/common/plugin/SfizzSettings.h
diff --git a/plugins/vst/SfizzSettings.mm b/plugins/common/plugin/SfizzSettings.mm
similarity index 100%
rename from plugins/vst/SfizzSettings.mm
rename to plugins/common/plugin/SfizzSettings.mm
diff --git a/plugins/vst/CMakeLists.txt b/plugins/vst/CMakeLists.txt
index c6b3cdc8..147139fe 100644
--- a/plugins/vst/CMakeLists.txt
+++ b/plugins/vst/CMakeLists.txt
@@ -38,31 +38,9 @@ add_library(sfizz-vst3-core STATIC
     SfizzVstUpdates.h
     SfizzVstUpdates.cpp
     SfizzVstIDs.h
-    SfizzFileScan.h
-    SfizzFileScan.cpp
-    SfizzForeignPaths.h
-    SfizzForeignPaths.cpp
-    SfizzSettings.h
-    SfizzSettings.cpp
-    FileTrie.h
-    FileTrie.cpp
-    NativeHelpers.h
-    NativeHelpers.cpp
     IdleUpdateHandler.h
     X11RunLoop.h
     X11RunLoop.cpp)
-if(APPLE)
-    target_sources(sfizz-vst3-core PRIVATE
-        SfizzForeignPaths.mm
-        SfizzSettings.mm
-        NativeHelpers.mm)
-    set_property(
-        SOURCE SfizzForeignPaths.mm
-               SfizzSettings.mm
-               NativeHelpers.mm
-        APPEND_STRING
-        PROPERTY COMPILE_FLAGS " -fobjc-arc")
-endif()
 target_include_directories(sfizz-vst3-core
     PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(sfizz-vst3-core
@@ -80,16 +58,6 @@ gw_target_warn(sfizz-vst3-core PRIVATE
     "-Wno-unused-parameter")
 add_library(sfizz::vst3-core ALIAS sfizz-vst3-core)
 
-# Link system dependencies
-if(WIN32)
-elseif(APPLE)
-else()
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GLIB REQUIRED glib-2.0)
-    target_include_directories(sfizz-vst3-core PRIVATE ${GLIB_INCLUDE_DIRS})
-    target_link_libraries(sfizz-vst3-core PRIVATE ${GLIB_LIBRARIES})
-endif()
-
 # Build the plugin
 add_library(${VSTPLUGIN_PRJ_NAME} MODULE "VstPluginFactory.cpp")
 if(WIN32)
diff --git a/plugins/vst/SfizzVstEditor.cpp b/plugins/vst/SfizzVstEditor.cpp
index f1768b9e..2bd4680e 100644
--- a/plugins/vst/SfizzVstEditor.cpp
+++ b/plugins/vst/SfizzVstEditor.cpp
@@ -8,9 +8,9 @@
 #include "SfizzVstState.h"
 #include "SfizzVstParameters.h"
 #include "SfizzVstUpdates.h"
-#include "SfizzFileScan.h"
 #include "editor/Editor.h"
 #include "editor/EditIds.h"
+#include "plugin/SfizzFileScan.h"
 #include "plugin/InstrumentDescription.h"
 #include "IdleUpdateHandler.h"
 #if !defined(__APPLE__) && !defined(_WIN32)
diff --git a/plugins/vst/SfizzVstProcessor.cpp b/plugins/vst/SfizzVstProcessor.cpp
index fbf31065..590445e0 100644
--- a/plugins/vst/SfizzVstProcessor.cpp
+++ b/plugins/vst/SfizzVstProcessor.cpp
@@ -9,8 +9,8 @@
 #include "SfizzVstState.h"
 #include "SfizzVstParameters.h"
 #include "SfizzVstIDs.h"
-#include "SfizzFileScan.h"
 #include "sfizz/import/ForeignInstrument.h"
+#include "plugin/SfizzFileScan.h"
 #include "plugin/InstrumentDescription.h"
 #include "base/source/fstreamer.h"
 #include "pluginterfaces/vst/ivstevents.h"