diff --git a/meson.build b/meson.build
index f2e5170b..791a3ed0 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,10 @@ vst3_plugin_sources = [
   'src/common/communication/common.cpp',
   'src/common/logging/common.cpp',
   'src/common/logging/vst3.cpp',
+  'src/common/serialization/vst3/component-handler/component-handler.cpp',
+  'src/common/serialization/vst3/component-handler/component-handler-2.cpp',
+  'src/common/serialization/vst3/component-handler/unit-handler.cpp',
+  'src/common/serialization/vst3/host-context/host-application.cpp',
   'src/common/serialization/vst3/plug-view/parameter-finder.cpp',
   'src/common/serialization/vst3/plug-view/plug-view.cpp',
   'src/common/serialization/vst3/plug-frame/plug-frame.cpp',
@@ -112,10 +116,6 @@ vst3_plugin_sources = [
   'src/common/serialization/vst3/plugin/program-list-data.cpp',
   'src/common/serialization/vst3/plugin/unit-data.cpp',
   'src/common/serialization/vst3/plugin/unit-info.cpp',
-  'src/common/serialization/vst3/component-handler/component-handler.cpp',
-  'src/common/serialization/vst3/component-handler/component-handler-2.cpp',
-  'src/common/serialization/vst3/component-handler/unit-handler.cpp',
-  'src/common/serialization/vst3/host-context/host-application.cpp',
   'src/common/serialization/vst3/attribute-list.cpp',
   'src/common/serialization/vst3/base.cpp',
   'src/common/serialization/vst3/component-handler-proxy.cpp',
@@ -162,6 +162,10 @@ host_sources = [
 if with_vst3
   host_sources += [
     'src/common/logging/vst3.cpp',
+    'src/common/serialization/vst3/component-handler/component-handler.cpp',
+    'src/common/serialization/vst3/component-handler/component-handler-2.cpp',
+    'src/common/serialization/vst3/component-handler/unit-handler.cpp',
+    'src/common/serialization/vst3/host-context/host-application.cpp',
     'src/common/serialization/vst3/plug-view/parameter-finder.cpp',
     'src/common/serialization/vst3/plug-view/plug-view.cpp',
     'src/common/serialization/vst3/plug-frame/plug-frame.cpp',
@@ -177,10 +181,6 @@ if with_vst3
     'src/common/serialization/vst3/plugin/program-list-data.cpp',
     'src/common/serialization/vst3/plugin/unit-data.cpp',
     'src/common/serialization/vst3/plugin/unit-info.cpp',
-    'src/common/serialization/vst3/component-handler/component-handler.cpp',
-    'src/common/serialization/vst3/component-handler/component-handler-2.cpp',
-    'src/common/serialization/vst3/component-handler/unit-handler.cpp',
-    'src/common/serialization/vst3/host-context/host-application.cpp',
     'src/common/serialization/vst3/attribute-list.cpp',
     'src/common/serialization/vst3/base.cpp',
     'src/common/serialization/vst3/component-handler-proxy.cpp',