diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index a25ad3bd799276bdf109a7d327ff5729a11bc9d2..e7c50a83b8d721b42e05f4f950eccb239c39b13b 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -369,7 +369,7 @@ iOSBuild {
         src/audio/QGCAudioWorker_iOS.mm \
         src/MobileScreenMgr.mm \
 }
-androidBuild {
+AndroidBuild {
     SOURCES += src/MobileScreenMgr.cc \
 }
 
diff --git a/src/MobileScreenMgr.cc b/src/MobileScreenMgr.cc
index 7f469e66e1780c532871559208f20f9b13eda2b8..1945ab3d9e4db632cf930d698469979e1f61deb6 100644
--- a/src/MobileScreenMgr.cc
+++ b/src/MobileScreenMgr.cc
@@ -26,6 +26,8 @@
 #include <QtAndroidExtras/QtAndroidExtras>
 #include <QtAndroidExtras/QAndroidJniObject>
 
+static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI";
+
 void MobileScreenMgr::setKeepScreenOn(bool keepScreenOn)
 {
     if (keepScreenOn) {
diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index ffff6337067cc8801429ffb830b520c31a1e9c89..9f7a9a9dbf2fe1df6d79f47834bee3d642a19a9e 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -40,10 +40,6 @@ QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
 
 const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled";
 
-#if defined __android__
-static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI";
-#endif
-
 MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
     : QGCTool(app)
     , _activeVehicleAvailable(false)