diff --git a/source/Makefile.mk b/source/Makefile.mk
index 00a36b317..b3f718370 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -657,8 +657,8 @@ BASE_FLAGS += -DCARLA_LIB_EXT=\"$(LIB_EXT)\"
 # Set static libs start & end
 
 ifneq ($(MACOS),true)
-LIBS_START = -Wl,--start-group
-LIBS_END   = -Wl,--end-group
+LIBS_START = -Wl,--start-group -Wl,--whole-archive
+LIBS_END   = -Wl,--no-whole-archive -Wl,--end-group
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/source/plugin/carla-vst-export-bridged.cpp b/source/plugin/carla-vst-export-bridged.cpp
index 0471195de..b871235fc 100644
--- a/source/plugin/carla-vst-export-bridged.cpp
+++ b/source/plugin/carla-vst-export-bridged.cpp
@@ -32,7 +32,7 @@ typedef const AEffect* (__cdecl *MainCallback)(audioMasterCallback);
 
 static HINSTANCE currentModuleHandle = nullptr;
 
-HINSTANCE getCurrentModuleInstanceHandle() noexcept
+static HINSTANCE getCurrentModuleInstanceHandle() noexcept
 {
     if (currentModuleHandle == nullptr)
         currentModuleHandle = GetModuleHandleA(nullptr);
diff --git a/source/plugin/symbols/carla-native-plugin.txt b/source/plugin/symbols/carla-native-plugin.txt
index 04fecac3a..fc42f3bbb 100644
--- a/source/plugin/symbols/carla-native-plugin.txt
+++ b/source/plugin/symbols/carla-native-plugin.txt
@@ -1,3 +1,4 @@
+carla_get_native_rack_plugin
 carla_get_native_patchbay_plugin
 carla_get_native_patchbay16_plugin
 carla_get_native_patchbay32_plugin
diff --git a/source/plugin/symbols/carla-native-plugin.version b/source/plugin/symbols/carla-native-plugin.version
index c06aa66c8..5321201ef 100644
--- a/source/plugin/symbols/carla-native-plugin.version
+++ b/source/plugin/symbols/carla-native-plugin.version
@@ -1,5 +1,6 @@
 {
-    global: carla_get_native_patchbay_plugin;
+    global: carla_get_native_rack_plugin;
+            carla_get_native_patchbay_plugin;
             carla_get_native_patchbay16_plugin;
             carla_get_native_patchbay32_plugin;
             carla_get_native_patchbay64_plugin;