diff --git a/src/blackgui/aircraftcombinedtypeselector.h b/src/blackgui/aircraftcombinedtypeselector.h
index 01ebc01be..f5771432b 100644
--- a/src/blackgui/aircraftcombinedtypeselector.h
+++ b/src/blackgui/aircraftcombinedtypeselector.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
 #define BLACKGUI_AIRCRAFTCOMBINEDTYPESELECTOR_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include <QFrame>
 #include <QScopedPointer>
@@ -24,7 +25,7 @@ namespace BlackGui
     /*!
      * Select by comined type ("L2J", "H1T", ...)
      */
-    class CAircraftCombinedTypeSelector : public QFrame
+    class BLACKGUI_EXPORT CAircraftCombinedTypeSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/colorselector.h b/src/blackgui/colorselector.h
index 4e107cea9..d26073af5 100644
--- a/src/blackgui/colorselector.h
+++ b/src/blackgui/colorselector.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_COLORSELECTOR_H
 #define BLACKGUI_COLORSELECTOR_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/rgbcolor.h"
 #include <QFrame>
 
@@ -22,7 +23,7 @@ namespace BlackGui
     /*!
      * Select a color
      */
-    class CColorSelector : public QFrame
+    class BLACKGUI_EXPORT CColorSelector : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/components/dbairlineicaoselectorbase.h b/src/blackgui/components/dbairlineicaoselectorbase.h
index 1aaaa4588..4cced3e5d 100644
--- a/src/blackgui/components/dbairlineicaoselectorbase.h
+++ b/src/blackgui/components/dbairlineicaoselectorbase.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_DBAIRLINEICAOSELECTORBASE_H
 #define BLACKGUI_DBAIRLINEICAOSELECTORBASE_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackcore/webdataservices.h"
 #include "blackgui/dropbase.h"
 #include "blackmisc/aviation/airlineicaocode.h"
@@ -26,7 +27,7 @@ namespace BlackGui
         /*!
          * Airline ICAO selector base class
          */
-        class CDbAirlineIcaoSelectorBase :
+        class BLACKGUI_EXPORT CDbAirlineIcaoSelectorBase :
             public QFrame,
             public BlackMisc::Network::CWebDataServicesAware,
             public BlackGui::CDropBase
diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/blackgui/components/dbautostashingcomponent.h
index 4775a0181..9b0793376 100644
--- a/src/blackgui/components/dbautostashingcomponent.h
+++ b/src/blackgui/components/dbautostashingcomponent.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
 #define BLACKGUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackcore/webdataservices.h"
 #include "dbmappingcomponentaware.h"
 #include "blackmisc/logcategorylist.h"
@@ -27,7 +28,7 @@ namespace BlackGui
         /*!
          * Stashing component
          */
-        class CDbAutoStashingComponent :
+        class BLACKGUI_EXPORT CDbAutoStashingComponent :
             public QDialog,
             public BlackMisc::Network::CWebDataServicesAware,
             public BlackGui::Components::CDbMappingComponentAware
diff --git a/src/blackgui/components/dbdebugdatabasesetup.h b/src/blackgui/components/dbdebugdatabasesetup.h
index d7a33027b..e09868ba7 100644
--- a/src/blackgui/components/dbdebugdatabasesetup.h
+++ b/src/blackgui/components/dbdebugdatabasesetup.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_COMPONENTS_DBDEBUGDATABASESETUP_H
 #define BLACKGUI_COMPONENTS_DBDEBUGDATABASESETUP_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackcore/data/globalsetup.h"
 #include <QFrame>
 #include <QScopedPointer>
@@ -26,7 +27,7 @@ namespace BlackGui
          * Debug settings for DB (only to be used as developer)
          * \remarks Disabled when not runnig in dev.environment
          */
-        class CDbDebugDatabaseSetup : public QFrame
+        class BLACKGUI_EXPORT CDbDebugDatabaseSetup : public QFrame
         {
             Q_OBJECT
 
diff --git a/src/blackgui/components/dbliveryselectorcomponent.h b/src/blackgui/components/dbliveryselectorcomponent.h
index e51239697..b002748a7 100644
--- a/src/blackgui/components/dbliveryselectorcomponent.h
+++ b/src/blackgui/components/dbliveryselectorcomponent.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
 #define BLACKGUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackcore/webdataservices.h"
 #include "blackgui/dropbase.h"
@@ -29,7 +30,7 @@ namespace BlackGui
         /*!
          * Selector for liveries
          */
-        class CDbLiverySelectorComponent :
+        class BLACKGUI_EXPORT CDbLiverySelectorComponent :
             public QFrame,
             public BlackMisc::Network::CWebDataServicesAware,
             public BlackGui::CDropBase
diff --git a/src/blackgui/dropbase.h b/src/blackgui/dropbase.h
index 9f6bd8354..c82dd3e72 100644
--- a/src/blackgui/dropbase.h
+++ b/src/blackgui/dropbase.h
@@ -10,6 +10,7 @@
 #ifndef BLACKGUI_DROPBASE_H
 #define BLACKGUI_DROPBASE_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/variant.h"
 #include <QLabel>
 #include <QMimeData>
@@ -19,7 +20,7 @@ namespace BlackGui
     /*!
      * Utilities for dropping swift value objects
      */
-    class CDropBase
+    class BLACKGUI_EXPORT CDropBase
     {
     public:
         //! Set text for drop site
diff --git a/src/blackgui/dropsite.h b/src/blackgui/dropsite.h
index 2755aeb4f..b18e27c07 100644
--- a/src/blackgui/dropsite.h
+++ b/src/blackgui/dropsite.h
@@ -10,6 +10,7 @@
 #ifndef BLACKGUI_DROPSITE_H
 #define BLACKGUI_DROPSITE_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/variant.h"
 #include "blackgui/dropbase.h"
 #include <QLabel>
@@ -21,7 +22,7 @@ namespace BlackGui
      * Area where items can be dropped
      * \remark inspired by Qt example: http://doc.qt.io/qt-4.8/qt-draganddrop-dropsite-example.html
      */
-    class CDropSite :
+    class BLACKGUI_EXPORT CDropSite :
         public QLabel,
         public CDropBase
     {
diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/blackgui/editors/aircrafticaoform.h
index c582f6778..43c026d40 100644
--- a/src/blackgui/editors/aircrafticaoform.h
+++ b/src/blackgui/editors/aircrafticaoform.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H
 #define BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackgui/editors/form.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/network/webdataservicesprovider.h"
@@ -27,7 +28,7 @@ namespace BlackGui
         /*!
          * Aircraft ICAO form
          */
-        class CAircraftIcaoForm :
+        class BLACKGUI_EXPORT CAircraftIcaoForm :
             public CForm,
             public BlackMisc::Network::CWebDataServicesAware
         {
diff --git a/src/blackgui/editors/airlineicaoform.h b/src/blackgui/editors/airlineicaoform.h
index 6e68af3ed..02fd42ab3 100644
--- a/src/blackgui/editors/airlineicaoform.h
+++ b/src/blackgui/editors/airlineicaoform.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITORS_AIRLINEICAOFORM_H
 #define BLACKGUI_EDITORS_AIRLINEICAOFORM_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/network/webdataservicesprovider.h"
 #include "blackmisc/statusmessagelist.h"
@@ -27,7 +28,7 @@ namespace BlackGui
         /*!
          * Airline ICAO code form
          */
-        class CAirlineIcaoForm :
+        class BLACKGUI_EXPORT CAirlineIcaoForm :
             public CForm,
             public BlackMisc::Network::CWebDataServicesAware
         {
diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h
index 87fc54bdb..90c9115bd 100644
--- a/src/blackgui/editors/distributorform.h
+++ b/src/blackgui/editors/distributorform.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITORS_DISTRIBUTORFORM_H
 #define BLACKGUI_EDITORS_DISTRIBUTORFORM_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackgui/editors/form.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/network/webdataservicesprovider.h"
@@ -27,7 +28,7 @@ namespace BlackGui
         /*!
          * Distributor form
          */
-        class CDistributorForm :
+        class BLACKGUI_EXPORT CDistributorForm :
             public CForm,
             public BlackMisc::Network::CWebDataServicesAware
         {
diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h
index f76f8936e..4e74c418a 100644
--- a/src/blackgui/editors/form.h
+++ b/src/blackgui/editors/form.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITORS_FORM_H
 #define BLACKGUI_EDITORS_FORM_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/network/authenticateduser.h"
 #include "blackcore/data/authenticateduser.h"
 #include <QFrame>
@@ -23,7 +24,7 @@ namespace BlackGui
         /*!
          * Form base class
          */
-        class CForm : public QFrame
+        class BLACKGUI_EXPORT CForm : public QFrame
         {
             Q_OBJECT
 
diff --git a/src/blackgui/editors/liveryform.h b/src/blackgui/editors/liveryform.h
index cf3a1fb76..4816f7c52 100644
--- a/src/blackgui/editors/liveryform.h
+++ b/src/blackgui/editors/liveryform.h
@@ -13,6 +13,7 @@
 #define BLACKGUI_EDITORS_LIVERYFORM_H
 
 #include "blackgui/editors/form.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/network/webdataservicesprovider.h"
 #include "blackmisc/statusmessagelist.h"
@@ -26,7 +27,7 @@ namespace BlackGui
         /*!
          * Livery form class
          */
-        class CLiveryForm :
+        class BLACKGUI_EXPORT CLiveryForm :
             public CForm,
             public BlackMisc::Network::CWebDataServicesAware
         {
diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h
index cc485f947..0e202b60f 100644
--- a/src/blackgui/editors/modelmappingform.h
+++ b/src/blackgui/editors/modelmappingform.h
@@ -13,6 +13,7 @@
 #define BLACKGUI_EDITORS_MODELMAPPINGFORM_H
 
 #include "blackgui/editors/form.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include <QScopedPointer>
 
@@ -25,7 +26,7 @@ namespace BlackGui
         /*!
          * Model mapping form
          */
-        class CModelMappingForm : public CForm
+        class BLACKGUI_EXPORT CModelMappingForm : public CForm
         {
             Q_OBJECT
 
diff --git a/src/blackgui/editors/modelmappingmodifyform.h b/src/blackgui/editors/modelmappingmodifyform.h
index ac540cdc9..7293dd387 100644
--- a/src/blackgui/editors/modelmappingmodifyform.h
+++ b/src/blackgui/editors/modelmappingmodifyform.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
 #define BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include <QFrame>
@@ -28,7 +29,7 @@ namespace BlackGui
         /*!
          * Allows to modify individual fields of the model form
          */
-        class CModelMappingModifyForm : public QFrame
+        class BLACKGUI_EXPORT CModelMappingModifyForm : public QFrame
         {
             Q_OBJECT
 
diff --git a/src/blackgui/editors/validationindicator.h b/src/blackgui/editors/validationindicator.h
index ea91cc719..a75318649 100644
--- a/src/blackgui/editors/validationindicator.h
+++ b/src/blackgui/editors/validationindicator.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_EDITOR_VALIDATIONINDICATOR_H
 #define BLACKGUI_EDITOR_VALIDATIONINDICATOR_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/statusmessagelist.h"
 #include <QFrame>
 #include <QScopedPointer>
@@ -26,7 +27,7 @@ namespace BlackGui
         /*!
          * Indication state of validation
          */
-        class CValidationIndicator : public QFrame
+        class BLACKGUI_EXPORT CValidationIndicator : public QFrame
         {
             Q_OBJECT
 
diff --git a/src/blackgui/hotkeydialog.h b/src/blackgui/hotkeydialog.h
index 9e2d620d2..9bf827ddd 100644
--- a/src/blackgui/hotkeydialog.h
+++ b/src/blackgui/hotkeydialog.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_HOTKEYDIALOG_H
 #define BLACKGUI_HOTKEYDIALOG_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackgui/models/actionmodel.h"
 #include "blackcore/inputmanager.h"
 #include "blackmisc/input/hotkeycombination.h"
@@ -32,7 +33,7 @@ namespace BlackGui
     /*!
      * Combobox for selecting keyboard keys
      */
-    class CKeySelectionBox : public QComboBox
+    class BLACKGUI_EXPORT CKeySelectionBox : public QComboBox
     {
         Q_OBJECT
 
@@ -57,7 +58,7 @@ namespace BlackGui
     /*!
      * Hotkey dialog
      */
-    class CHotkeyDialog : public QDialog
+    class BLACKGUI_EXPORT CHotkeyDialog : public QDialog
     {
         Q_OBJECT
 
diff --git a/src/blackgui/labelandicon.h b/src/blackgui/labelandicon.h
index 685d60221..4c5f0af67 100644
--- a/src/blackgui/labelandicon.h
+++ b/src/blackgui/labelandicon.h
@@ -10,6 +10,7 @@
 #ifndef BLACKGUI_LABELANDICON_H
 #define BLACKGUI_LABELANDICON_H
 
+#include "blackgui/blackguiexport.h"
 #include <QFrame>
 #include <QScopedPointer>
 
@@ -20,7 +21,7 @@ namespace BlackGui
     /*!
      * Label and icon frame
      */
-    class CLabelAndIcon : public QFrame
+    class BLACKGUI_EXPORT CLabelAndIcon : public QFrame
     {
         Q_OBJECT
 
diff --git a/src/blackgui/loadindicator.h b/src/blackgui/loadindicator.h
index f004ef4c0..99b92e4d6 100644
--- a/src/blackgui/loadindicator.h
+++ b/src/blackgui/loadindicator.h
@@ -25,7 +25,7 @@ namespace BlackGui
      * Progress indicators are indeterminate and do nothing more than spin to show that the application is busy.
      * \note based on https://github.com/mojocorp/QProgressIndicator under MIT license
      */
-    class CLoadIndicator : public QWidget
+    class BLACKGUI_EXPORT CLoadIndicator : public QWidget
     {
         Q_OBJECT
 
diff --git a/src/blackgui/models/actionmodel.h b/src/blackgui/models/actionmodel.h
index b2fc3fefe..813ef7b3e 100644
--- a/src/blackgui/models/actionmodel.h
+++ b/src/blackgui/models/actionmodel.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_ACTIONMODEL_H
 #define BLACKGUI_ACTIONMODEL_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackcore/actionbind.h"
 #include <QAbstractItemModel>
 #include <QScopedPointer>
@@ -25,7 +26,7 @@ namespace BlackGui
         /*!
          * Action tree model
          */
-        class CActionModel : public QAbstractItemModel
+        class BLACKGUI_EXPORT CActionModel : public QAbstractItemModel
         {
             Q_OBJECT
 
diff --git a/src/blackgui/shortcut.h b/src/blackgui/shortcut.h
index 2bcd93032..804e3c6a4 100644
--- a/src/blackgui/shortcut.h
+++ b/src/blackgui/shortcut.h
@@ -14,6 +14,7 @@
 #ifndef BLACKGUI_SHORTCUT_H
 #define BLACKGUI_SHORTCUT_H
 
+#include "blackgui/blackguiexport.h"
 #include <QShortcut>
 
 namespace BlackGui
@@ -21,7 +22,7 @@ namespace BlackGui
     /*!
      * Shortcut class to avoid overlapping shortcut defintions
      */
-    class CShortcut
+    class BLACKGUI_EXPORT CShortcut
     {
     public:
         //! No constructor
diff --git a/src/blackgui/simulatorselector.h b/src/blackgui/simulatorselector.h
index 572fa254d..27240c093 100644
--- a/src/blackgui/simulatorselector.h
+++ b/src/blackgui/simulatorselector.h
@@ -10,6 +10,7 @@
 #ifndef BLACKGUI_SIMULATORSELECTOR_H
 #define BLACKGUI_SIMULATORSELECTOR_H
 
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/simulatorinfo.h"
 #include <QScopedPointer>
 #include <QFrame>
@@ -21,7 +22,7 @@ namespace BlackGui
     /*!
      * Select simulator
      */
-    class CSimulatorSelector : public QFrame
+    class BLACKGUI_EXPORT CSimulatorSelector : public QFrame
     {
         Q_OBJECT