diff --git a/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h b/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
index a9a36f227..6bdd6532d 100644
--- a/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
+++ b/ground/openpilotgcs/src/libs/glc_lib/glc_ext.h
@@ -30,6 +30,11 @@
 // Buffer offset used by VBO
 #define BUFFER_OFFSET(i) ((char*)NULL + (i))
 
+#if defined(Q_OS_MAC)
+#include "gl.h"
+#include "glu.h"
+#endif
+
 #if !defined(Q_OS_MAC)
 // ARB_vertex_buffer_object
 extern PFNGLBINDBUFFERARBPROC			glBindBuffer;
diff --git a/ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp b/ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp
index 05eba540f..7229178bc 100644
--- a/ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp
+++ b/ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp
@@ -25,6 +25,11 @@
 
 #include "glc_camera.h"
 
+#if defined(Q_OS_MAC)
+#include "gl.h"
+#include "glu.h"
+#endif
+
 #include <QtDebug>
 
 using namespace glc;
diff --git a/ground/openpilotgcs/src/plugins/plugins.pro b/ground/openpilotgcs/src/plugins/plugins.pro
index e58608301..90cba4670 100644
--- a/ground/openpilotgcs/src/plugins/plugins.pro
+++ b/ground/openpilotgcs/src/plugins/plugins.pro
@@ -64,11 +64,13 @@ plugin_uavobjectbrowser.depends = plugin_coreplugin
 plugin_uavobjectbrowser.depends += plugin_uavobjects
 SUBDIRS += plugin_uavobjectbrowser
 
+!contains(QT_VERSION, ^4\\.8\\..*) {
 # ModelView UAVGadget
 plugin_modelview.subdir = modelview
 plugin_modelview.depends = plugin_coreplugin
 plugin_modelview.depends += plugin_uavobjects
 SUBDIRS += plugin_modelview
+}
 
 #Uploader gadget
 plugin_uploader.subdir = uploader