diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp
index 7013a3800..967fced16 100644
--- a/src/blackmisc/blackmiscfreefunctions.cpp
+++ b/src/blackmisc/blackmiscfreefunctions.cpp
@@ -27,61 +27,6 @@
 #include <QProcessEnvironment>
 #include <QSysInfo>
 
-/*
- * Metadata for PQs
- */
-void BlackMisc::PhysicalQuantities::registerMetadata()
-{
-    CMeasurementUnit::registerMetadata();
-    CAcceleration::registerMetadata();
-    CAccelerationUnit::registerMetadata();
-    CAngle::registerMetadata();
-    CAngleUnit::registerMetadata();
-    CFrequency::registerMetadata();
-    CFrequencyUnit::registerMetadata();
-    CLength::registerMetadata();
-    CLengthUnit::registerMetadata();
-    CMass::registerMetadata();
-    CMassUnit::registerMetadata();
-    CPressure::registerMetadata();
-    CPressureUnit::registerMetadata();
-    CSpeed::registerMetadata();
-    CSpeedUnit::registerMetadata();
-    CTemperature::registerMetadata();
-    CTemperatureUnit::registerMetadata();
-    CTime::registerMetadata();
-    CTimeUnit::registerMetadata();
-    CPqString::registerMetadata();
-}
-
-/*
- * Metadata for aviation
- */
-void BlackMisc::Aviation::registerMetadata()
-{
-    CComSystem::registerMetadata();
-    CNavSystem::registerMetadata();
-    CAdfSystem::registerMetadata();
-    CAltitude::registerMetadata();
-    CTransponder::registerMetadata();
-    CHeading::registerMetadata();
-    CTrack::registerMetadata();
-    CInformationMessage::registerMetadata();
-    CCallsign::registerMetadata();
-    CCallsignList::registerMetadata();
-    CAtcStation::registerMetadata();
-    CAtcStationList::registerMetadata();
-    CAircraft::registerMetadata();
-    CAircraftList::registerMetadata();
-    CAirport::registerMetadata();
-    CAirportList::registerMetadata();
-    CAircraftSituation::registerMetadata();
-    CAircraftIcao::registerMetadata();
-    CAirportIcao::registerMetadata();
-    CSelcal::registerMetadata();
-    CFlightPlan::registerMetadata();
-}
-
 /*
  * Metadata for Math
  */
@@ -105,25 +50,6 @@ void BlackMisc::Geo::registerMetadata()
     CLongitude::registerMetadata();
 }
 
-/*
- * Metadata for Network
- */
-void BlackMisc::Network::registerMetadata()
-{
-    CUser::registerMetadata();
-    CUserList::registerMetadata();
-    CServer::registerMetadata();
-    CServerList::registerMetadata();
-    CTextMessage::registerMetadata();
-    CTextMessageList::registerMetadata();
-    CClient::registerMetadata();
-    CClientList::registerMetadata();
-    CAircraftModel::registerMetadata();
-    CVoiceCapabilities::registerMetadata();
-    CAircraftMapping::registerMetadata();
-    CAircraftMappingList::registerMetadata();
-}
-
 /*
  * Metadata for Settings
  */
diff --git a/src/blackmisc/blackmiscfreefunctions_avmeta.cpp b/src/blackmisc/blackmiscfreefunctions_avmeta.cpp
new file mode 100644
index 000000000..ad3d8b599
--- /dev/null
+++ b/src/blackmisc/blackmiscfreefunctions_avmeta.cpp
@@ -0,0 +1,42 @@
+/* Copyright (C) 2014
+ * 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 and at http://www.swift-project.org/license.html. 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.
+ */
+
+#include "blackmiscfreefunctions.h"
+#include "avallclasses.h"
+
+/*
+ * Metadata for aviation
+ *
+ * In a separate file to workaround a limitation of MinGW:
+ * http://stackoverflow.com/q/16596876/1639256
+ */
+void BlackMisc::Aviation::registerMetadata()
+{
+    CComSystem::registerMetadata();
+    CNavSystem::registerMetadata();
+    CAdfSystem::registerMetadata();
+    CAltitude::registerMetadata();
+    CTransponder::registerMetadata();
+    CHeading::registerMetadata();
+    CTrack::registerMetadata();
+    CInformationMessage::registerMetadata();
+    CCallsign::registerMetadata();
+    CCallsignList::registerMetadata();
+    CAtcStation::registerMetadata();
+    CAtcStationList::registerMetadata();
+    CAircraft::registerMetadata();
+    CAircraftList::registerMetadata();
+    CAirport::registerMetadata();
+    CAirportList::registerMetadata();
+    CAircraftSituation::registerMetadata();
+    CAircraftIcao::registerMetadata();
+    CAirportIcao::registerMetadata();
+    CSelcal::registerMetadata();
+    CFlightPlan::registerMetadata();
+}
diff --git a/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
new file mode 100644
index 000000000..b3911e0af
--- /dev/null
+++ b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
@@ -0,0 +1,33 @@
+/* Copyright (C) 2014
+ * 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 and at http://www.swift-project.org/license.html. 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.
+ */
+
+#include "blackmiscfreefunctions.h"
+#include "networkallclasses.h"
+
+/*
+ * Metadata for Network
+ *
+ * In a separate file to workaround a limitation of MinGW:
+ * http://stackoverflow.com/q/16596876/1639256
+ */
+void BlackMisc::Network::registerMetadata()
+{
+    CUser::registerMetadata();
+    CUserList::registerMetadata();
+    CServer::registerMetadata();
+    CServerList::registerMetadata();
+    CTextMessage::registerMetadata();
+    CTextMessageList::registerMetadata();
+    CClient::registerMetadata();
+    CClientList::registerMetadata();
+    CAircraftModel::registerMetadata();
+    CVoiceCapabilities::registerMetadata();
+    CAircraftMapping::registerMetadata();
+    CAircraftMappingList::registerMetadata();
+}
diff --git a/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp b/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp
new file mode 100644
index 000000000..06c133a77
--- /dev/null
+++ b/src/blackmisc/blackmiscfreefunctions_pqmeta.cpp
@@ -0,0 +1,41 @@
+/* Copyright (C) 2014
+ * 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 and at http://www.swift-project.org/license.html. 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.
+ */
+
+#include "blackmiscfreefunctions.h"
+#include "pqallquantities.h"
+
+/*
+ * Metadata for PQs
+ *
+ * In a separate file to workaround a limitation of MinGW:
+ * http://stackoverflow.com/q/16596876/1639256
+ */
+void BlackMisc::PhysicalQuantities::registerMetadata()
+{
+    CMeasurementUnit::registerMetadata();
+    CAcceleration::registerMetadata();
+    CAccelerationUnit::registerMetadata();
+    CAngle::registerMetadata();
+    CAngleUnit::registerMetadata();
+    CFrequency::registerMetadata();
+    CFrequencyUnit::registerMetadata();
+    CLength::registerMetadata();
+    CLengthUnit::registerMetadata();
+    CMass::registerMetadata();
+    CMassUnit::registerMetadata();
+    CPressure::registerMetadata();
+    CPressureUnit::registerMetadata();
+    CSpeed::registerMetadata();
+    CSpeedUnit::registerMetadata();
+    CTemperature::registerMetadata();
+    CTemperatureUnit::registerMetadata();
+    CTime::registerMetadata();
+    CTimeUnit::registerMetadata();
+    CPqString::registerMetadata();
+}