diff --git a/cmake/Modules/FindSgp4.cmake b/cmake/Modules/FindSgp4.cmake
index 96dfbc713..708e4cbae 100644
--- a/cmake/Modules/FindSgp4.cmake
+++ b/cmake/Modules/FindSgp4.cmake
@@ -5,9 +5,9 @@ IF(NOT SGP4_FOUND)
     FIND_PATH(
         SGP4_INCLUDE_DIR
         NAMES SGP4.h
-        HINTS ${SGP4_DIR}/include/SGP4
-        PATHS /usr/local/include/SGP4
-              /usr/include/SGP4
+        HINTS ${SGP4_DIR}/include/libsgp4
+        PATHS /usr/local/include/libsgp4
+              /usr/include/libsgp4
     )
 
     FIND_LIBRARY(
diff --git a/plugins/channelrx/demodapt/aptdemodimageworker.h b/plugins/channelrx/demodapt/aptdemodimageworker.h
index d2ea79030..31418060c 100644
--- a/plugins/channelrx/demodapt/aptdemodimageworker.h
+++ b/plugins/channelrx/demodapt/aptdemodimageworker.h
@@ -37,6 +37,8 @@
 
 class APTDemod;
 
+using namespace libsgp4;
+
 class APTDemodImageWorker : public QObject
 {
     Q_OBJECT
diff --git a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
index 3e2e07868..1b6bc60e9 100644
--- a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
+++ b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
@@ -26,6 +26,8 @@
 #include "satelliteselectiondialog.h"
 #include "util/units.h"
 
+using namespace libsgp4;
+
 SatelliteSelectionDialog::SatelliteSelectionDialog(SatelliteTrackerSettings *settings,
         const QHash<QString, SatNogsSatellite *>& satellites,
         QWidget* parent) :
diff --git a/plugins/feature/satellitetracker/satellitetrackersgp4.cpp b/plugins/feature/satellitetracker/satellitetrackersgp4.cpp
index 9967c319c..f5d6f3685 100644
--- a/plugins/feature/satellitetracker/satellitetrackersgp4.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackersgp4.cpp
@@ -29,6 +29,8 @@
 
 #include "satellitetrackersgp4.h"
 
+using namespace libsgp4;
+
 // Convert QGP4 DateTime to Qt QDataTime
 static QDateTime dateTimeToQDateTime(DateTime dt)
 {