diff --git a/data/copy-juce b/data/copy-juce
index 7551c28c5..a72ac3408 100755
--- a/data/copy-juce
+++ b/data/copy-juce
@@ -17,6 +17,7 @@ done
 
 find $CARLA_MODULES_DIR -name juce_module_info -delete
 rm -rf $CARLA_MODULES_DIR/juce_*/native/java/
+rm -rf $CARLA_MODULES_DIR/juce_*/native/javacore/
 rm -rf $CARLA_MODULES_DIR/juce_*/native/javaopt/
 rm -rf $CARLA_MODULES_DIR/juce_*/native/oboe/
 
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index ea9e5d0b5..695681d37 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -253,11 +253,10 @@ debug:
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-$(BINDIR)/libcarla_host-plugin$(LIB_EXT): $(OBJDIR)/carla-host-plugin.cpp.o $(OBJDIR)/carla-native-plugin.cpp.o $(LIBS)
+$(BINDIR)/libcarla_host-plugin$(LIB_EXT): $(OBJDIR)/carla-host-plugin.cpp.o $(LIBS)
 	-@mkdir -p $(BINDIR)
 	@echo "Linking libcarla-host-plugin$(LIB_EXT)"
-	@$(CXX) $(OBJDIR)/carla-host-plugin.cpp.o $(OBJDIR)/carla-native-plugin.cpp.o \
-		$(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(NATIVE_LINK_FLAGS) -o $@
+	@$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(NATIVE_LINK_FLAGS) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/plugin/carla-host-plugin.cpp b/source/plugin/carla-host-plugin.cpp
index cf0aef8ba..0a5361ca6 100644
--- a/source/plugin/carla-host-plugin.cpp
+++ b/source/plugin/carla-host-plugin.cpp
@@ -19,6 +19,8 @@
 
 #define CARLA_PLUGIN_EXPORT
 
+#include "carla-native-plugin.cpp"
+
 // -------------------------------------------------------------------------------------------------------------------
 // Include utils code first
 
diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp
index b52b5e715..41996a789 100644
--- a/source/plugin/carla-native-plugin.cpp
+++ b/source/plugin/carla-native-plugin.cpp
@@ -23,6 +23,15 @@
 
 #include "water/files/File.h"
 
+// --------------------------------------------------------------------------------------------------------------------
+// Expose info functions as needed
+
+#ifndef CARLA_PLUGIN_EXPORT
+# include "utils/Information.cpp"
+#endif
+
+// --------------------------------------------------------------------------------------------------------------------
+
 CARLA_BACKEND_USE_NAMESPACE
 
 // --------------------------------------------------------------------------------------------------------------------