diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@
         find_package(KF5 COMPONENTS NotifyConfig)
         MACRO_BOOL_TO_01(KF5NotifyConfig_FOUND HAVE_NOTIFYCONFIG)
 
-        find_package(KF5 REQUIRED COMPONENTS Auth Config Crash DocTools WidgetsAddons NewStuff I18n KIO XmlGui Plotting Notifications)
+        find_package(KF5 REQUIRED COMPONENTS Auth Config Crash WidgetsAddons NewStuff I18n KIO XmlGui Plotting Notifications)
     endif()
 else(BUILD_KSTARS_LITE)
     # Find Optional package NotifyConfig for desktop notifications
@@ -139,9 +139,15 @@
     if("${CMAKE_TOOLCHAIN_FILE}" MATCHES "android.toolchain.cmake$")
         set(extra_cmake "-DM_LIB=-lm")
     endif()
+
+    find_program(DOS2UNIX dos2unix)
+    if (NOT DOS2UNIX)
+        message(FATAL_ERROR "Could not find dos2unix")
+    endif()
+
     externalproject_add(cfitsio SOURCE_DIR "${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio"
         URL https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3370.tar.gz
-        PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && dos2unix ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio/CMakeLists.txt && patch -p1 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
+        PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && ${DOS2UNIX} ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio/CMakeLists.txt && patch -p1 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
         CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${extra_cmake}
         BUILD_COMMAND make cfitsio
         BUILD_IN_SOURCE 1
diff --git a/android/3rdparty/libraw.patch b/android/3rdparty/libraw.patch
--- a/android/3rdparty/libraw.patch
+++ b/android/3rdparty/libraw.patch
@@ -50,7 +50,7 @@
  
   */
  
-+#if ANDROID
++#ifdef __ANDROID__
 +#include <swab.h>
 +#endif
 +
@@ -65,7 +65,7 @@
  */
  
  
-+#ifdef ANDROID
++#ifdef __ANDROID__
 +
 +#include <sys/types.h>
 +#include <stdint.h>
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -1120,7 +1120,7 @@
 
 qt5_add_resources(KSTARS_APP_SRCS data/kstars.qrc)
 
-if ("${CMAKE_TOOLCHAIN_FILE}" MATCHES "android.toolchain.cmake$")
+if (ANDROID)
     add_library(kstars SHARED ${KSTARS_APP_SRCS})
     target_compile_options(kstars PRIVATE ${KSTARSLITE_CPP_OPTIONS} -DUSE_QT5_INDI -DKSTARS_LITE)
     add_dependencies(KStarsLiteLib cfitsio indi raw)
diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
--- a/kstars/fitsviewer/fitsdata.cpp
+++ b/kstars/fitsviewer/fitsdata.cpp
@@ -1246,7 +1246,7 @@
     double FSum = 0, HF = 0, TF = 0;
     const double resolution = 1.0 / 20.0;
 
-    int cen_y = std::round(center->y);
+    int cen_y = qRound(center->y);
 
     double rightEdge = center->x + center->width / 2.0;
     double leftEdge  = center->x - center->width / 2.0;
@@ -1452,7 +1452,7 @@
     double FSum = 0, HF = 0, TF = 0, min = stats.min[0];
     const double resolution = 1.0 / 20.0;
 
-    int cen_y = std::round(center->y);
+    int cen_y = qRound(center->y);
 
     double rightEdge = center->x + center->width / 2.0;
     double leftEdge  = center->x - center->width / 2.0;
diff --git a/kstars/kstarslite.cpp b/kstars/kstarslite.cpp
--- a/kstars/kstarslite.cpp
+++ b/kstars/kstarslite.cpp
@@ -107,8 +107,8 @@
     // Set the About information
     QObject *aboutDialog = m_RootObject->findChild<QObject*>("aboutDialog");
 
-    aboutDialog->setProperty("versionText", i18n("Version: %1", KSTARS_VERSION));
-    aboutDialog->setProperty("buildText", i18n("Build: %1", KSTARS_BUILD_TS));
+    aboutDialog->setProperty("versionText", i18n("Version: %1", QStringLiteral(KSTARS_VERSION)));
+    aboutDialog->setProperty("buildText", i18n("Build: %1", QStringLiteral(KSTARS_BUILD_TS)));
     aboutDialog->setProperty("teamText", QString("2001-" + QString::number(QDate::currentDate().year()) + i18n("(c), The KStars Team")));
     aboutDialog->setProperty("licenseText", i18n("License: GPLv2"));