diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp
index ad3d92019..db14178a2 100644
--- a/plugins/carlabase/carla.cpp
+++ b/plugins/carlabase/carla.cpp
@@ -251,16 +251,16 @@ intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opco
 
     switch (opcode)
     {
-    case HOST_OPCODE_NULL:
+    case NATIVE_HOST_OPCODE_NULL:
         break;
-    case HOST_OPCODE_UPDATE_PARAMETER:
-    case HOST_OPCODE_UPDATE_MIDI_PROGRAM:
-    case HOST_OPCODE_RELOAD_PARAMETERS:
-    case HOST_OPCODE_RELOAD_MIDI_PROGRAMS:
-    case HOST_OPCODE_RELOAD_ALL:
+    case NATIVE_HOST_OPCODE_UPDATE_PARAMETER:
+    case NATIVE_HOST_OPCODE_UPDATE_MIDI_PROGRAM:
+    case NATIVE_HOST_OPCODE_RELOAD_PARAMETERS:
+    case NATIVE_HOST_OPCODE_RELOAD_MIDI_PROGRAMS:
+    case NATIVE_HOST_OPCODE_RELOAD_ALL:
         // nothing
         break;
-    case HOST_OPCODE_UI_UNAVAILABLE:
+    case NATIVE_HOST_OPCODE_UI_UNAVAILABLE:
         handleUiClosed();
         break;
     }
@@ -459,7 +459,7 @@ PluginView* CarlaInstrument::instantiateView(QWidget* parent)
 
 void CarlaInstrument::sampleRateChanged()
 {
-    fDescriptor->dispatcher(fHandle, PLUGIN_OPCODE_SAMPLE_RATE_CHANGED, 0, 0, nullptr, handleGetSampleRate());
+    fDescriptor->dispatcher(fHandle, NATIVE_PLUGIN_OPCODE_SAMPLE_RATE_CHANGED, 0, 0, nullptr, handleGetSampleRate());
 }
 
 // -------------------------------------------------------------------
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index 2b454b381..266a1415a 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -70,6 +70,11 @@
 #include "text_float.h"
 
 
+#if QT_VERSION < 0x040800
+#define MiddleButton MidButton
+#endif
+
+
 typedef AutomationPattern::timeMap timeMap;
 
 
diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp
index 9827ce2e7..95ec8b42a 100644
--- a/src/gui/plugin_browser.cpp
+++ b/src/gui/plugin_browser.cpp
@@ -28,6 +28,8 @@
 #include <QtGui/QMouseEvent>
 #include <QtGui/QScrollArea>
 
+#include <algorithm> // for std::sort
+
 #include "plugin_browser.h"
 #include "embed.h"
 #include "debug.h"