diff --git a/Makefile b/Makefile
index 4b5f7c93f..6ccf9fa19 100644
--- a/Makefile
+++ b/Makefile
@@ -15,22 +15,15 @@ PYRCC ?= pyrcc4 -py3
 
 # -------------------------------------------------------------------------------------------------------------------------------------
 
-HAVE_OPENGL = $(shell pkg-config --exists gl && echo true)
-HAVE_QTCORE = $(shell pkg-config --exists QtCore && echo true)
-
-ifneq ($(HAVE_OPENGL),true)
-all:
-	@echo Error: Missing OpenGL or pkg-config, cannot build
-	@exit 1
-else
-ifneq ($(HAVE_QTCORE),true)
-all:
-	@echo Error: Missing QtCore, cannot build
-	@exit 1
-else
+# HAVE_LIBS = $(shell pkg-config --exists freetype2 x11 && echo true)
+
+# ifneq ($(HAVE_LIBS),true)
+# all
+# 	@echo Error Missing libraries or pkg-config, cannot build
+# 	@exit 1
+# else
 all: CPP RES UI WIDGETS
-endif
-endif
+# endif
 
 # -------------------------------------------------------------------------------------------------------------------------------------
 # C++ code
diff --git a/source/Makefile.mk b/source/Makefile.mk
index dc3fd9301..3a9f0a8f2 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -53,6 +53,7 @@ BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 # --------------------------------------------------------------
 
 HAVE_JACK         = $(shell pkg-config --exists jack && echo true)
+HAVE_OPENGL       = $(shell pkg-config --exists gl && echo true)
 
 HAVE_AF_DEPS      = $(shell pkg-config --exists libavcodec libavformat sndfile && echo true)
 HAVE_ZYN_DEPS     = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
diff --git a/source/backend/CarlaBackend.hpp b/source/backend/CarlaBackend.hpp
index 233e75f97..d2037cf21 100644
--- a/source/backend/CarlaBackend.hpp
+++ b/source/backend/CarlaBackend.hpp
@@ -721,12 +721,6 @@ struct MidiProgramData {
         : bank(0),
           program(0),
           name(nullptr) {}
-
-    ~MidiProgramData()
-    {
-        if (name != nullptr)
-            delete[] name;
-    }
 };
 
 /*!
diff --git a/source/discovery/Makefile b/source/discovery/Makefile
index d56c80c22..456bce54d 100644
--- a/source/discovery/Makefile
+++ b/source/discovery/Makefile
@@ -74,11 +74,8 @@ carla-discovery-win64.exe: $(OBJS) $(LIBS_win64)
 
 # --------------------------------------------------------------
 
-../libs/lilv.a:
-	$(MAKE) -C ../libs/lilv
-
-../libs/lilv_%.a:
-	$(MAKE) -C ../libs/lilv $*
+../libs/%:
+	$(MAKE) -C ../libs $*
 
 # --------------------------------------------------------------
 
diff --git a/source/includes/pugl b/source/includes/pugl
deleted file mode 120000
index 055d4d7e4..000000000
--- a/source/includes/pugl
+++ /dev/null
@@ -1 +0,0 @@
-../libs/pugl/
\ No newline at end of file
diff --git a/source/tests/ANSI.cpp b/source/tests/ANSI.cpp
index 3f34b7aff..1b7b9fda0 100644
--- a/source/tests/ANSI.cpp
+++ b/source/tests/ANSI.cpp
@@ -18,7 +18,9 @@
 // still need qt classes check
 //#include "plugin/CarlaPluginInternal.hpp"
 //#include "plugin/DssiPlugin.cpp"
-#include "../widgets/digitalpeakmeter.cpp"
+//#include "../widgets/digitalpeakmeter.cpp"
+
+#include "CarlaJuceHeader.hpp"
 
 #if 0
 #include "CarlaDefines.hpp"
diff --git a/source/tests/Makefile b/source/tests/Makefile
index eec498dcb..450d8dce8 100644
--- a/source/tests/Makefile
+++ b/source/tests/Makefile
@@ -9,8 +9,9 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I../backend -I../includes -I../libs -I../utils -Wall -Wextra
-BUILD_CXX_FLAGS += -DWANT_JACK -DWANT_LADSPA -DWANT_DSSI
-BUILD_CXX_FLAGS += -isystem /usr/include/qt4
+BUILD_CXX_FLAGS += -isystem ../libs/juce
+# BUILD_CXX_FLAGS += -DWANT_JACK -DWANT_LADSPA -DWANT_DSSI
+# BUILD_CXX_FLAGS += -isystem /usr/include/qt4
 # BUILD_CXX_FLAGS += -isystem ../backend/engine/rtaudio-4.0.11
 # BUILD_CXX_FLAGS += -I/opt/mingw32/include