diff --git a/src/Airmap/AirMapFlightManager.h b/src/Airmap/AirMapFlightManager.h
index 1cd6dd8..94921e7 100644
--- a/src/Airmap/AirMapFlightManager.h
+++ b/src/Airmap/AirMapFlightManager.h
@@ -13,6 +13,7 @@
 
 #include <QObject>
 #include <QTimer>
+#include <QList>
 
 //-----------------------------------------------------------------------------
 /// class to upload a flight
diff --git a/src/Airmap/AirMapRestrictionManager.cc b/src/Airmap/AirMapRestrictionManager.cc
index f3c007a..015ef8e 100644
--- a/src/Airmap/AirMapRestrictionManager.cc
+++ b/src/Airmap/AirMapRestrictionManager.cc
@@ -7,8 +7,9 @@
  *
  ****************************************************************************/
 
-#include "AirMapManager.h"
 #include "AirMapRestrictionManager.h"
+#include "AirMapSharedState.h"
+#include "AirMapManager.h"
 
 AirMapRestrictionManager::AirMapRestrictionManager(AirMapSharedState& shared)
     : _shared(shared)
diff --git a/src/Airmap/AirMapRulesetsManager.cc b/src/Airmap/AirMapRulesetsManager.cc
index 6f67a0c..daa9fd1 100644
--- a/src/Airmap/AirMapRulesetsManager.cc
+++ b/src/Airmap/AirMapRulesetsManager.cc
@@ -7,8 +7,9 @@
  *
  ****************************************************************************/
 
-#include "AirMapManager.h"
 #include "AirMapRulesetsManager.h"
+#include "AirMapSharedState.h"
+#include "AirMapManager.h"
 
 //-----------------------------------------------------------------------------
 AirMapRulesetsManager::AirMapRulesetsManager(AirMapSharedState& shared)
diff --git a/src/Airmap/AirMapSharedState.cc b/src/Airmap/AirMapSharedState.cc
index f10cd92..71eba24 100644
--- a/src/Airmap/AirMapSharedState.cc
+++ b/src/Airmap/AirMapSharedState.cc
@@ -7,8 +7,8 @@
  *
  ****************************************************************************/
 
-#include "AirMapManager.h"
 #include "AirMapSharedState.h"
+#include "AirMapManager.h"
 
 void
 AirMapSharedState::setSettings(const Settings& settings)
diff --git a/src/Airmap/AirMapTrafficMonitor.cc b/src/Airmap/AirMapTrafficMonitor.cc
index e990d38..819ac54 100644
--- a/src/Airmap/AirMapTrafficMonitor.cc
+++ b/src/Airmap/AirMapTrafficMonitor.cc
@@ -7,8 +7,8 @@
  *
  ****************************************************************************/
 
-#include "AirMapManager.h"
 #include "AirMapTrafficMonitor.h"
+#include "AirMapManager.h"
 
 AirMapTrafficMonitor::~AirMapTrafficMonitor()
 {
diff --git a/src/AirspaceManagement/AirspaceManager.h b/src/AirspaceManagement/AirspaceManager.h
index 07cfa3f..69d7bd1 100644
--- a/src/AirspaceManagement/AirspaceManager.h
+++ b/src/AirspaceManagement/AirspaceManager.h
@@ -43,22 +43,6 @@ Q_DECLARE_LOGGING_CATEGORY(AirspaceManagementLog)
 
 //-----------------------------------------------------------------------------
 /**
- * Contains the status of the Airspace authorization
- */
-class AirspaceAuthorization : public QObject {
-    Q_OBJECT
-public:
-    enum PermitStatus {
-        PermitUnknown = 0,
-        PermitPending,
-        PermitAccepted,
-        PermitRejected,
-    };
-    Q_ENUM(PermitStatus)
-};
-
-//-----------------------------------------------------------------------------
-/**
  * @class AirspaceManager
  * Base class for airspace management. There is one (global) instantiation of this
  */