diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index d6a975b62af9ae7d6f7d017cc0af2401eb2a407f..2b2e46dc3fef245e67bb6fc6756828ec0070251c 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -158,6 +158,7 @@ linux-g++ {
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
 
     INCLUDEPATH += /usr/include \
+				   /usr/local/include \
                    /usr/include/qt4/phonon
               # $$BASEDIR/lib/flite/include \
               # $$BASEDIR/lib/flite/lang
diff --git a/src/ui/map3D/GCManipulator.cc b/src/ui/map3D/GCManipulator.cc
index 6f2fb0e7f80bf0496ccf72707de2c132f7793bf4..05c9b246c9328055016a96095541e1251b17892c 100644
--- a/src/ui/map3D/GCManipulator.cc
+++ b/src/ui/map3D/GCManipulator.cc
@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
     if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
     {
         // rotate camera
-#ifdef __APPLE__
-        osg::Vec3d axis;
-#else
+#ifdef __WIN32__
         osg::Vec3 axis;
+#else
+        osg::Vec3d axis;
 #endif
         float angle;
 
diff --git a/src/ui/map3D/QMap3D.cc b/src/ui/map3D/QMap3D.cc
index ab4c98b915d22351867f28a6a43e06f1c5ea8b0d..83ff90179ab0be7bfda1b1eb7c49616a897892e3 100644
--- a/src/ui/map3D/QMap3D.cc
+++ b/src/ui/map3D/QMap3D.cc
@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
         QWidget(parent,f)
 {
     setupUi(this);
-    graphicsView->setCameraManipulator(new osgEarthUtil::EarthManipulator);
+    graphicsView->setCameraManipulator(new osgEarth::Util::EarthManipulator);
     graphicsView->setSceneData(new osg::Group);
     graphicsView->updateCamera();
     show();