diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h
index 49c6b54cd..40d7d467e 100644
--- a/src/blackcore/context/contextnetworkproxy.h
+++ b/src/blackcore/context/contextnetworkproxy.h
@@ -21,7 +21,7 @@
 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/network/clientlist.h"
-#include "blackmisc/network/network.h"
+#include "blackmisc/network/loginmode.h"
 #include "blackmisc/network/server.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/textmessagelist.h"
diff --git a/src/blackcore/registermetadata.cpp b/src/blackcore/registermetadata.cpp
index ad67e2eb0..364fa6191 100644
--- a/src/blackcore/registermetadata.cpp
+++ b/src/blackcore/registermetadata.cpp
@@ -18,7 +18,7 @@
 #include "blackcore/simulator.h"
 #include "blackcore/webreaderflags.h"
 #include "blackcore/aircraftmatcher.h"
-#include "blackmisc/network/network.h"
+#include "blackmisc/network/loginmode.h"
 #include "blackmisc/dbus.h"
 #include "blackmisc/valueobject.h"
 
diff --git a/src/blackmisc/audio/audio.h b/src/blackmisc/audio/audio.h
deleted file mode 100644
index e7d40db02..000000000
--- a/src/blackmisc/audio/audio.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2013
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-//! \file
-
-#ifndef BLACKMISC_AUDIO_AUDIO_H
-#define BLACKMISC_AUDIO_AUDIO_H
-
-/*!
- * \namespace BlackMisc::Audio
- * \brief Audio classes such as audio devices and voice rooms.
- */
-
-#include "blackmisc/audio/audiodeviceinfo.h"
-#include "blackmisc/audio/audiodeviceinfolist.h"
-#include "blackmisc/audio/audiosettings.h"
-#include "blackmisc/audio/voicesetup.h"
-
-#endif // guard
diff --git a/src/blackmisc/audio/registermetadataaudio.cpp b/src/blackmisc/audio/registermetadataaudio.cpp
index 1f42bb5df..0894f795e 100644
--- a/src/blackmisc/audio/registermetadataaudio.cpp
+++ b/src/blackmisc/audio/registermetadataaudio.cpp
@@ -7,7 +7,13 @@
  */
 
 #include "blackmisc/audio/registermetadataaudio.h"
-#include "blackmisc/audio/audio.h"
+
+// Audio headers
+#include "blackmisc/audio/audiodeviceinfo.h"
+#include "blackmisc/audio/audiodeviceinfolist.h"
+#include "blackmisc/audio/audiosettings.h"
+#include "blackmisc/audio/voicesetup.h"
+
 #include "blackmisc/audio/ptt.h"
 #include <QDBusMetaType>
 
diff --git a/src/blackmisc/aviation/aviation.h b/src/blackmisc/aviation/aviation.h
deleted file mode 100644
index 40d9cf625..000000000
--- a/src/blackmisc/aviation/aviation.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright (C) 2013
- * swift Project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_AVIATION_AVIATION_H
-#define BLACKMISC_AVIATION_AVIATION_H
-
-/*!
- * \namespace BlackMisc::Aviation
- * \brief Aviation and Avionics classes such as CHeading or CTransponder .
- */
-
-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/aviation/heading.h"
-#include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/aviation/navsystem.h"
-#include "blackmisc/aviation/transponder.h"
-#include "blackmisc/aviation/track.h"
-#include "blackmisc/aviation/callsign.h"
-#include "blackmisc/aviation/callsignset.h"
-#include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/aviation/aircrafticaocodelist.h"
-#include "blackmisc/aviation/aircraftcategory.h"
-#include "blackmisc/aviation/aircraftcategorylist.h"
-#include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/aviation/aircraftsituationchange.h"
-#include "blackmisc/aviation/aircraftsituationlist.h"
-#include "blackmisc/aviation/aircraftvelocity.h"
-#include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/aviation/airport.h"
-#include "blackmisc/aviation/airporticaocode.h"
-#include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/aviation/informationmessage.h"
-#include "blackmisc/aviation/selcal.h"
-#include "blackmisc/aviation/flightplan.h"
-#include "blackmisc/aviation/flightplanlist.h"
-#include "blackmisc/aviation/simbriefdata.h"
-#include "blackmisc/aviation/aircraftengine.h"
-#include "blackmisc/aviation/aircraftenginelist.h"
-#include "blackmisc/aviation/aircraftlights.h"
-#include "blackmisc/aviation/aircraftparts.h"
-#include "blackmisc/aviation/aircraftpartslist.h"
-#include "blackmisc/aviation/livery.h"
-#include "blackmisc/aviation/liverylist.h"
-
-#endif // guard
diff --git a/src/blackmisc/aviation/registermetadataaviation.cpp b/src/blackmisc/aviation/registermetadataaviation.cpp
index da0738d18..7c1cd4579 100644
--- a/src/blackmisc/aviation/registermetadataaviation.cpp
+++ b/src/blackmisc/aviation/registermetadataaviation.cpp
@@ -7,7 +7,43 @@
  */
 
 #include "blackmisc/aviation/registermetadataaviation.h"
-#include "blackmisc/aviation/aviation.h"
+
+// Aviation headers
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/navsystem.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/aviation/track.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/aircraftcategory.h"
+#include "blackmisc/aviation/aircraftcategorylist.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/aircraftsituationchange.h"
+#include "blackmisc/aviation/aircraftsituationlist.h"
+#include "blackmisc/aviation/aircraftvelocity.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/airport.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/informationmessage.h"
+#include "blackmisc/aviation/selcal.h"
+#include "blackmisc/aviation/flightplan.h"
+#include "blackmisc/aviation/flightplanlist.h"
+#include "blackmisc/aviation/simbriefdata.h"
+#include "blackmisc/aviation/aircraftengine.h"
+#include "blackmisc/aviation/aircraftenginelist.h"
+#include "blackmisc/aviation/aircraftlights.h"
+#include "blackmisc/aviation/aircraftparts.h"
+#include "blackmisc/aviation/aircraftpartslist.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/aviation/liverylist.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/db/db.h b/src/blackmisc/db/db.h
deleted file mode 100644
index 9a3a6f2aa..000000000
--- a/src/blackmisc/db/db.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2017
- * swift Project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_DB_DB_H
-#define BLACKMISC_DB_DB_H
-
-/*!
- * \namespace BlackMisc::Db
- * \brief DB related classes for access to swift DB.
- */
-
-#include "blackmisc/db/datastoreobjectlist.h"
-#include "blackmisc/db/datastore.h"
-#include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/db/dbinfolist.h"
-#include "blackmisc/db/dbinfo.h"
-#include "blackmisc/db/dbflags.h"
-#include "blackmisc/db/distribution.h"
-#include "blackmisc/db/distributionlist.h"
-#include "blackmisc/db/artifact.h"
-#include "blackmisc/db/artifactlist.h"
-#include "blackmisc/db/updateinfo.h"
-
-#endif // guard
diff --git a/src/blackmisc/db/registermetadatadb.cpp b/src/blackmisc/db/registermetadatadb.cpp
index 29c8ed8b7..5186a9b65 100644
--- a/src/blackmisc/db/registermetadatadb.cpp
+++ b/src/blackmisc/db/registermetadatadb.cpp
@@ -7,10 +7,19 @@
  */
 
 #include "blackmisc/db/registermetadatadb.h"
-#include "blackmisc/db/db.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc
+// DB headers
+#include "blackmisc/db/dbinfolist.h"
+#include "blackmisc/db/dbinfo.h"
+#include "blackmisc/db/dbflags.h"
+#include "blackmisc/db/distribution.h"
+#include "blackmisc/db/distributionlist.h"
+#include "blackmisc/db/artifact.h"
+#include "blackmisc/db/artifactlist.h"
+#include "blackmisc/db/updateinfo.h"
+
 {
     namespace Db
     {
diff --git a/src/blackmisc/geo/geo.h b/src/blackmisc/geo/geo.h
deleted file mode 100644
index fdf63f65e..000000000
--- a/src/blackmisc/geo/geo.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2013
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_GEO_GEO_H
-#define BLACKMISC_GEO_GEO_H
-
-/*!
- * \namespace BlackMisc::Geo
- * \brief Geo classes such as latitude, longitude, etc.
- */
-
-#include "blackmisc/geo/earthangle.h"
-#include "blackmisc/geo/latitude.h"
-#include "blackmisc/geo/longitude.h"
-#include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/geo/coordinategeodeticlist.h"
-#include "blackmisc/geo/elevationplane.h"
-
-#endif // guard
diff --git a/src/blackmisc/geo/registermetadatageo.cpp b/src/blackmisc/geo/registermetadatageo.cpp
index ee26bbab0..70cce4402 100644
--- a/src/blackmisc/geo/registermetadatageo.cpp
+++ b/src/blackmisc/geo/registermetadatageo.cpp
@@ -7,9 +7,15 @@
  */
 
 #include "blackmisc/geo/registermetadatageo.h"
-#include "blackmisc/geo/geo.h"
 
 namespace BlackMisc
+// Geo headers
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/coordinategeodeticlist.h"
+#include "blackmisc/geo/elevationplane.h"
+
 {
     namespace Geo
     {
diff --git a/src/blackmisc/input/input.h b/src/blackmisc/input/input.h
deleted file mode 100644
index 056a12450..000000000
--- a/src/blackmisc/input/input.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 2015
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_INPUT_HOTKEY_H
-#define BLACKMISC_INPUT_HOTKEY_H
-
-#include "blackmisc/input/actionhotkeylist.h"
-#include "blackmisc/input/hotkeycombination.h"
-#include "blackmisc/input/keyboardkeylist.h"
-#include "blackmisc/input/joystickbuttonlist.h"
-
-#endif // guard
diff --git a/src/blackmisc/input/registermetadatainput.cpp b/src/blackmisc/input/registermetadatainput.cpp
index 826a15056..43438a3d0 100644
--- a/src/blackmisc/input/registermetadatainput.cpp
+++ b/src/blackmisc/input/registermetadatainput.cpp
@@ -7,7 +7,12 @@
  */
 
 #include "blackmisc/input/registermetadatainput.h"
-#include "blackmisc/input/input.h"
+
+// Input headers
+#include "blackmisc/input/actionhotkeylist.h"
+#include "blackmisc/input/hotkeycombination.h"
+#include "blackmisc/input/keyboardkeylist.h"
+#include "blackmisc/input/joystickbuttonlist.h"
 
 #include <QDBusMetaType>
 
diff --git a/src/blackmisc/network/network.h b/src/blackmisc/network/network.h
deleted file mode 100644
index 1249a95d1..000000000
--- a/src/blackmisc/network/network.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 2013
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-//! \file
-
-#ifndef BLACKMISC_NETWORK_NETWORK_H
-#define BLACKMISC_NETWORK_NETWORK_H
-
-/*!
- * \namespace BlackMisc::Network
- * \brief Classes related to the traffic network, swift DB, such as VATSIM user, utilities, URL etc.
- */
-
-#include "blackmisc/network/authenticateduser.h"
-#include "blackmisc/network/client.h"
-#include "blackmisc/network/clientlist.h"
-#include "blackmisc/network/connectionstatus.h"
-#include "blackmisc/network/ecosystem.h"
-#include "blackmisc/network/ecosystemlist.h"
-#include "blackmisc/network/entityflags.h"
-#include "blackmisc/network/facilitytype.h"
-#include "blackmisc/network/fsdsetup.h"
-#include "blackmisc/network/loginmode.h"
-#include "blackmisc/network/rawfsdmessage.h"
-#include "blackmisc/network/rawfsdmessagelist.h"
-#include "blackmisc/network/role.h"
-#include "blackmisc/network/rolelist.h"
-#include "blackmisc/network/remotefile.h"
-#include "blackmisc/network/remotefilelist.h"
-#include "blackmisc/network/server.h"
-#include "blackmisc/network/serverlist.h"
-#include "blackmisc/network/textmessage.h"
-#include "blackmisc/network/textmessagelist.h"
-#include "blackmisc/network/url.h"
-#include "blackmisc/network/urllist.h"
-#include "blackmisc/network/urllog.h"
-#include "blackmisc/network/urlloglist.h"
-#include "blackmisc/network/user.h"
-#include "blackmisc/network/userlist.h"
-#include "blackmisc/network/voicecapabilities.h"
-#include "blackmisc/network/settings/networksettings.h"
-
-#endif // guard
diff --git a/src/blackmisc/network/registermetadatanetwork.cpp b/src/blackmisc/network/registermetadatanetwork.cpp
index 9996472c3..e50f8eda6 100644
--- a/src/blackmisc/network/registermetadatanetwork.cpp
+++ b/src/blackmisc/network/registermetadatanetwork.cpp
@@ -7,7 +7,36 @@
  */
 
 #include "blackmisc/network/registermetadatanetwork.h"
-#include "blackmisc/network/network.h"
+
+// Network headers
+#include "blackmisc/network/authenticateduser.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/connectionstatus.h"
+#include "blackmisc/network/ecosystem.h"
+#include "blackmisc/network/ecosystemlist.h"
+#include "blackmisc/network/entityflags.h"
+#include "blackmisc/network/facilitytype.h"
+#include "blackmisc/network/fsdsetup.h"
+#include "blackmisc/network/loginmode.h"
+#include "blackmisc/network/rawfsdmessage.h"
+#include "blackmisc/network/rawfsdmessagelist.h"
+#include "blackmisc/network/role.h"
+#include "blackmisc/network/rolelist.h"
+#include "blackmisc/network/remotefile.h"
+#include "blackmisc/network/remotefilelist.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/serverlist.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/network/textmessagelist.h"
+#include "blackmisc/network/url.h"
+#include "blackmisc/network/urllist.h"
+#include "blackmisc/network/urllog.h"
+#include "blackmisc/network/urlloglist.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/userlist.h"
+#include "blackmisc/network/voicecapabilities.h"
+#include "blackmisc/network/settings/networksettings.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/pq/constants.h b/src/blackmisc/pq/constants.h
index f9257d805..d4b97120a 100644
--- a/src/blackmisc/pq/constants.h
+++ b/src/blackmisc/pq/constants.h
@@ -12,7 +12,9 @@
 #define BLACKMISC_PQ_CONSTANTS_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/pq.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/frequency.h"
 
 namespace BlackMisc::PhysicalQuantities
 {
diff --git a/src/blackmisc/pq/pq.h b/src/blackmisc/pq/pq.h
deleted file mode 100644
index a33653c3b..000000000
--- a/src/blackmisc/pq/pq.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2013
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_PQ_PQ_H
-#define BLACKMISC_PQ_PQ_H
-
-/*!
- * \namespace BlackMisc::PhysicalQuantities
- * \brief Classes for physical quantities and units such as length, mass, speed.
- */
-
-// All units / quantities, required for the instantiations of the template
-// especially as CRTP (Curiously recurring template pattern) is used.
-// https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl
-// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
-
-#include "blackmisc/pq/acceleration.h"
-#include "blackmisc/pq/angle.h"
-#include "blackmisc/pq/frequency.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/mass.h"
-#include "blackmisc/pq/pqstring.h"
-#include "blackmisc/pq/pressure.h"
-#include "blackmisc/pq/speed.h"
-#include "blackmisc/pq/temperature.h"
-#include "blackmisc/pq/time.h"
-
-#endif // guard
diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp
index f2638d54a..cb41b23e2 100644
--- a/src/blackmisc/simulation/registermetadatasimulation.cpp
+++ b/src/blackmisc/simulation/registermetadatasimulation.cpp
@@ -7,7 +7,32 @@
  */
 
 #include "blackmisc/simulation/registermetadatasimulation.h"
-#include "blackmisc/simulation/simulation.h"
+
+// Simulation headers
+#include "blackmisc/simulation/aircraftmatchersetup.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/airspaceaircraftsnapshot.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/distributorlistpreferences.h"
+#include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/simulation/interpolationsetuplist.h"
+#include "blackmisc/simulation/matchingstatistics.h"
+#include "blackmisc/simulation/matchinglog.h"
+#include "blackmisc/simulation/reverselookup.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/simulation/simulatorinfolist.h"
+#include "blackmisc/simulation/simulatorinternals.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackmisc/simulation/simulatorplugininfolist.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
+#include "blackmisc/simulation/fsx/simconnectutilities.h"
+#include "blackmisc/simulation/settings/modelsettings.h"
+#include "blackmisc/simulation/settings/simulatorsettings.h"
+#include "blackmisc/simulation/settings/swiftpluginsettings.h"
+#include "blackmisc/simulation/settings/xswiftbussettings.h"
+
 #include "blackmisc/variant.h"
 
 using namespace BlackMisc::Simulation;
diff --git a/src/blackmisc/simulation/simulation.h b/src/blackmisc/simulation/simulation.h
deleted file mode 100644
index fd29afab0..000000000
--- a/src/blackmisc/simulation/simulation.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2015
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-#ifndef BLACKMISC_SIMULATION_SIMULATION_H
-#define BLACKMISC_SIMULATION_SIMULATION_H
-
-/*!
- * \namespace BlackMisc::Simulation
- * \brief Generic simulation related class, but not OS or driver dependent
- */
-
-#include "blackmisc/simulation/aircraftmatchersetup.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/airspaceaircraftsnapshot.h"
-#include "blackmisc/simulation/distributorlist.h"
-#include "blackmisc/simulation/distributorlistpreferences.h"
-#include "blackmisc/simulation/interpolationrenderingsetup.h"
-#include "blackmisc/simulation/interpolationsetuplist.h"
-#include "blackmisc/simulation/matchingstatistics.h"
-#include "blackmisc/simulation/matchinglog.h"
-#include "blackmisc/simulation/reverselookup.h"
-#include "blackmisc/simulation/simulatedaircraft.h"
-#include "blackmisc/simulation/simulatedaircraftlist.h"
-#include "blackmisc/simulation/simulatorinfolist.h"
-#include "blackmisc/simulation/simulatorinternals.h"
-#include "blackmisc/simulation/simulatorplugininfo.h"
-#include "blackmisc/simulation/simulatorplugininfolist.h"
-#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
-#include "blackmisc/simulation/fsx/simconnectutilities.h"
-#include "blackmisc/simulation/settings/modelsettings.h"
-#include "blackmisc/simulation/settings/simulatorsettings.h"
-#include "blackmisc/simulation/settings/swiftpluginsettings.h"
-#include "blackmisc/simulation/settings/xswiftbussettings.h"
-
-#endif // guard
diff --git a/src/blackmisc/weather/registermetadataweather.cpp b/src/blackmisc/weather/registermetadataweather.cpp
index 5b6aecd83..ebdad5cc6 100644
--- a/src/blackmisc/weather/registermetadataweather.cpp
+++ b/src/blackmisc/weather/registermetadataweather.cpp
@@ -8,10 +8,28 @@
 
 #include "blackmisc/weather/registermetadataweather.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/weather/weather.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc
+// Weather headers
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/gridpoint.h"
+#include "blackmisc/weather/metar.h"
+#include "blackmisc/weather/metarlist.h"
+#include "blackmisc/weather/presentweather.h"
+#include "blackmisc/weather/presentweatherlist.h"
+#include "blackmisc/weather/temperaturelayer.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/visibilitylayer.h"
+#include "blackmisc/weather/visibilitylayerlist.h"
+#include "blackmisc/weather/weatherdataplugininfo.h"
+#include "blackmisc/weather/weatherdataplugininfolist.h"
+#include "blackmisc/weather/weathergrid.h"
+#include "blackmisc/weather/weatherscenario.h"
+#include "blackmisc/weather/windlayer.h"
+#include "blackmisc/weather/windlayerlist.h"
+
 {
     namespace Weather
     {
diff --git a/src/blackmisc/weather/weather.h b/src/blackmisc/weather/weather.h
deleted file mode 100644
index 01f9f6ef5..000000000
--- a/src/blackmisc/weather/weather.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2015
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-//! \file
-
-#ifndef BLACKMISC_WEATHER_WEATHER_H
-#define BLACKMISC_WEATHER_WEATHER_H
-
-/*!
- * \namespace BlackMisc::Weather
- * \brief Weather and Metar classes
- */
-
-#include "blackmisc/weather/cloudlayer.h"
-#include "blackmisc/weather/cloudlayerlist.h"
-#include "blackmisc/weather/gridpoint.h"
-#include "blackmisc/weather/metar.h"
-#include "blackmisc/weather/metarlist.h"
-#include "blackmisc/weather/presentweather.h"
-#include "blackmisc/weather/presentweatherlist.h"
-#include "blackmisc/weather/temperaturelayer.h"
-#include "blackmisc/weather/temperaturelayerlist.h"
-#include "blackmisc/weather/visibilitylayer.h"
-#include "blackmisc/weather/visibilitylayerlist.h"
-#include "blackmisc/weather/weatherdataplugininfo.h"
-#include "blackmisc/weather/weatherdataplugininfolist.h"
-#include "blackmisc/weather/weathergrid.h"
-#include "blackmisc/weather/weatherscenario.h"
-#include "blackmisc/weather/windlayer.h"
-#include "blackmisc/weather/windlayerlist.h"
-
-#endif // guard