diff --git a/source/carla_widgets.py b/source/carla_widgets.py
index 245e83425..9134deb34 100644
--- a/source/carla_widgets.py
+++ b/source/carla_widgets.py
@@ -1638,3 +1638,16 @@ class PluginWidget(QFrame):
 
         painter.restore()
         QFrame.paintEvent(self, event)
+
+# ------------------------------------------------------------------------------------------------------------
+# TESTING
+
+hasGL = True
+
+from PyQt5.QtWidgets import QApplication
+app = QApplication(sys.argv)
+#gui = PluginParameter(None, pInfo, 0, 0)
+#gui = PluginEdit(None, 0)
+gui = PluginWidget(None, 0)
+gui.show()
+app.exec_()
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index e861ac240..11429b407 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -118,20 +118,20 @@ debug:
 
 # --------------------------------------------------------------
 
-carla-native-base.cpp.o: carla-native-base.cpp ../modules/carla_native/CarlaNative.h
+carla-native-base.cpp.o: carla-native-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-export.cpp.o: carla-native-export.cpp carla-native-base.cpp ../modules/carla_native/CarlaNative.h
+carla-native-export.cpp.o: carla-native-export.cpp carla-native-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-plugin.cpp.o: carla-native-plugin.cpp carla-native-base.cpp ../modules/carla_native/CarlaNative.h
+carla-native-plugin.cpp.o: carla-native-plugin.cpp carla-native-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
 carla-native-export: carla-native-export.cpp.o $(LIBS)
 	$(CXX) $^ $(LINK_FLAGS) -o $@
-# 	./carla-native-export
+	./carla-native-export
 
 carla-native-export.exe: carla-native-export.cpp.o $(LIBS)
 	$(CXX) $^ $(LINK_FLAGS) -o $@
diff --git a/source/plugin/carla-native-base.cpp b/source/plugin/carla-native-base.cpp
index 988694d5d..f21b19003 100644
--- a/source/plugin/carla-native-base.cpp
+++ b/source/plugin/carla-native-base.cpp
@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#include "carla_native/CarlaNative.h"
+#include "CarlaNative.h"
 #include "RtList.hpp"
 
 #include "lv2/lv2.h"
diff --git a/source/plugin/carla-native-export.cpp b/source/plugin/carla-native-export.cpp
index e1a88f822..ef279f97a 100644
--- a/source/plugin/carla-native-export.cpp
+++ b/source/plugin/carla-native-export.cpp
@@ -17,7 +17,7 @@
 
 #include "carla-native-base.cpp"
 
-#include "JuceHeader.h"
+#include "juce_core.h"
 
 #include "lv2/atom.h"
 #include "lv2/buf-size.h"
diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp
index 348c6ab64..bb1bbd221 100644
--- a/source/plugin/carla-native-plugin.cpp
+++ b/source/plugin/carla-native-plugin.cpp
@@ -17,6 +17,8 @@
 
 #include "carla-native-base.cpp"
 
+#include "juce_audio_basics.h"
+
 #include "CarlaString.hpp"
 
 #include "lv2/atom.h"