diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp
index 2ac5b31c4..7d11d88a8 100644
--- a/source/backend/CarlaStandalone.cpp
+++ b/source/backend/CarlaStandalone.cpp
@@ -665,7 +665,7 @@ const char* carla_get_supported_file_extensions()
         {
             const StringArray& exts((*it)->getFileExtensions());
 
-            for (String *eit=exts.begin(), *end=exts.end(); eit != end; ++eit)
+            for (String *eit=exts.begin(), *eend=exts.end(); eit != eend; ++eit)
                 retText += String(";*" + (*eit)).toRawUTF8();
         }
 
diff --git a/source/backend/Makefile b/source/backend/Makefile
index 4f843a5a0..30bb33b98 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -69,6 +69,10 @@ STANDALONE_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
 
+ifeq ($(HAVE_X11),true)
+STANDALONE_FLAGS += $(X11_LIBS)
+endif
+
 # --------------------------------------------------------------
 
 OBJS = \
diff --git a/source/backend/engine/CarlaEngineThread.cpp b/source/backend/engine/CarlaEngineThread.cpp
index be10da895..c58dbc6c2 100644
--- a/source/backend/engine/CarlaEngineThread.cpp
+++ b/source/backend/engine/CarlaEngineThread.cpp
@@ -31,6 +31,11 @@ CarlaEngineThread::CarlaEngineThread(CarlaEngine* const engine) noexcept
     carla_debug("CarlaEngineThread::CarlaEngineThread(%p)", engine);
 }
 
+CarlaEngineThread::~CarlaEngineThread() noexcept
+{
+    carla_debug("CarlaEngineThread::~CarlaEngineThread()");
+}
+
 // -----------------------------------------------------------------------
 
 void CarlaEngineThread::run() noexcept
diff --git a/source/backend/engine/CarlaEngineThread.hpp b/source/backend/engine/CarlaEngineThread.hpp
index 18d174f32..c78236aa9 100644
--- a/source/backend/engine/CarlaEngineThread.hpp
+++ b/source/backend/engine/CarlaEngineThread.hpp
@@ -30,6 +30,7 @@ class CarlaEngineThread : public CarlaThread
 {
 public:
     CarlaEngineThread(CarlaEngine* const engine) noexcept;
+    ~CarlaEngineThread() noexcept override;
 
 protected:
     void run() noexcept override;
diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile
index 66acb40a0..6a3c85c2a 100644
--- a/source/backend/plugin/Makefile
+++ b/source/backend/plugin/Makefile
@@ -59,7 +59,7 @@ CarlaPluginThread.cpp.o: CarlaPluginThread.cpp $(CARLA_PLUGIN_THREAD_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 CarlaPluginUi.cpp.o: CarlaPluginUi.cpp $(CARLA_PLUGIN_UI_CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) $(X11_FLAGS) -c -o $@
 
 NativePlugin.cpp.o: NativePlugin.cpp $(NATIVE_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 46743c976..582904819 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -36,11 +36,15 @@ endif
 endif
 
 ifeq ($(HAVE_JUCE_UI),true)
-LINK_PLUGIN_FLAGS  += $(JUCE_AUDIO_PROCESSORS_LIBS)
-LINK_PLUGIN_FLAGS  += $(JUCE_DATA_STRUCTURES_LIBS)
-LINK_PLUGIN_FLAGS  += $(JUCE_EVENTS_LIBS)
-LINK_PLUGIN_FLAGS  += $(JUCE_GRAPHICS_LIBS)
-LINK_PLUGIN_FLAGS  += $(JUCE_GUI_BASICS_LIBS)
+LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS)
+LINK_PLUGIN_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_PLUGIN_FLAGS += $(JUCE_EVENTS_LIBS)
+LINK_PLUGIN_FLAGS += $(JUCE_GRAPHICS_LIBS)
+LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS)
+endif
+
+ifeq ($(HAVE_X11),true)
+LINK_PLUGIN_FLAGS += $(X11_LIBS)
 endif
 
 # --------------------------------------------------------------
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index c6baab14d..31d6b2bd9 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -53,6 +53,10 @@ LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
 
+ifeq ($(HAVE_X11),true)
+LINK_FLAGS += $(X11_LIBS)
+endif
+
 # --------------------------------------------------------------
 # Native
 
diff --git a/source/utils/CarlaBase64Utils.hpp b/source/utils/CarlaBase64Utils.hpp
index 64d770233..f4e05be8e 100644
--- a/source/utils/CarlaBase64Utils.hpp
+++ b/source/utils/CarlaBase64Utils.hpp
@@ -22,6 +22,7 @@
 #include "CarlaUtils.hpp"
 
 #include <cctype>
+#include <vector>
 
 // -----------------------------------------------------------------------
 // Helpers