diff --git a/src/blackgui/components/abouthtmlcomponent.h b/src/blackgui/components/abouthtmlcomponent.h
index 74df8cc3e..e5b39bf60 100644
--- a/src/blackgui/components/abouthtmlcomponent.h
+++ b/src/blackgui/components/abouthtmlcomponent.h
@@ -19,7 +19,7 @@
 namespace Ui { class CAboutHtmlComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Display the HTML info "about swift"
      */
     class BLACKGUI_EXPORT CAboutHtmlComponent : public QFrame
diff --git a/src/blackgui/components/aircraftmodelsetvalidationdialog.h b/src/blackgui/components/aircraftmodelsetvalidationdialog.h
index c2d72bcec..96d13eb65 100644
--- a/src/blackgui/components/aircraftmodelsetvalidationdialog.h
+++ b/src/blackgui/components/aircraftmodelsetvalidationdialog.h
@@ -28,7 +28,7 @@ namespace BlackMisc
 }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Dialog for CAircraftModelValidationComponent
      * \remark aircraft model view has a simplified version BlackGui::Views::CAircraftModelValidationDialog
      */
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.h b/src/blackgui/components/aircraftmodelvalidationcomponent.h
index e247bbac0..9c984880a 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.h
+++ b/src/blackgui/components/aircraftmodelvalidationcomponent.h
@@ -31,7 +31,7 @@ namespace BlackMisc
 }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Handle validation result
      */
     class BLACKGUI_EXPORT CAircraftModelValidationComponent : public COverlayMessagesFrame
diff --git a/src/blackgui/components/altitudedialog.h b/src/blackgui/components/altitudedialog.h
index 684cf8579..7590511aa 100644
--- a/src/blackgui/components/altitudedialog.h
+++ b/src/blackgui/components/altitudedialog.h
@@ -19,7 +19,7 @@
 namespace Ui { class CAltitudeDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Dialog to get a correct altitude
      */
     class CAltitudeDialog : public QDialog
diff --git a/src/blackgui/components/callsigncompleter.h b/src/blackgui/components/callsigncompleter.h
index be4af9c64..a45f352a5 100644
--- a/src/blackgui/components/callsigncompleter.h
+++ b/src/blackgui/components/callsigncompleter.h
@@ -24,7 +24,7 @@
 namespace Ui { class CCallsignCompleter; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Completer for aircraft callsigns
      */
     class BLACKGUI_EXPORT CCallsignCompleter : public QFrame
diff --git a/src/blackgui/components/configsimulatorcomponent.h b/src/blackgui/components/configsimulatorcomponent.h
index 705b2529a..de85927d3 100644
--- a/src/blackgui/components/configsimulatorcomponent.h
+++ b/src/blackgui/components/configsimulatorcomponent.h
@@ -20,7 +20,7 @@
 namespace Ui { class CConfigSimulatorComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Simulator configuration
      */
     class CConfigSimulatorComponent : public QFrame
@@ -55,7 +55,7 @@ namespace BlackGui::Components
         QScopedPointer<Ui::CConfigSimulatorComponent> ui;
     };
 
-    /**
+    /*!
      * Wizard page for CConfigSimulatorComponent
      */
     class CConfigSimulatorWizardPage : public QWizardPage
diff --git a/src/blackgui/components/configurationwizard.h b/src/blackgui/components/configurationwizard.h
index 835d049e9..c0d9cdfcc 100644
--- a/src/blackgui/components/configurationwizard.h
+++ b/src/blackgui/components/configurationwizard.h
@@ -18,7 +18,7 @@
 namespace Ui { class CConfigurationWizard; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Configure the most important settings
      */
     class BLACKGUI_EXPORT CConfigurationWizard : public QWizard
diff --git a/src/blackgui/components/copyconfigurationcomponent.h b/src/blackgui/components/copyconfigurationcomponent.h
index de86ef001..817ebde5f 100644
--- a/src/blackgui/components/copyconfigurationcomponent.h
+++ b/src/blackgui/components/copyconfigurationcomponent.h
@@ -140,7 +140,7 @@ namespace BlackGui::Components
         BlackMisc::CData<BlackCore::Data::TVatsimLastServer> m_lastVatsimServer { this }; //!< recently used VATSIM server
     };
 
-    /**
+    /*!
      * Wizard page for CCopyConfigurationComponent
      */
     class CCopyConfigurationWizardPage : public QWizardPage
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h
index 9b8dc3cca..36ec49966 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h
+++ b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.h
@@ -21,7 +21,7 @@
 namespace Ui { class CCopyModelsFromOtherSwiftVersionsComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Copy models from another swift version
      */
     class CCopyModelsFromOtherSwiftVersionsComponent : public COverlayMessagesFrame
@@ -58,7 +58,7 @@ namespace BlackGui::Components
         BlackMisc::Simulation::Data::CModelSetCaches m_modelSetCaches { false, this };
     };
 
-    /**
+    /*!
      * Wizard page for CCopyModelsFromOtherSwiftVersionsComponent
      */
     class CCopyModelsFromOtherSwiftVersionsWizardPage : public QWizardPage
diff --git a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h b/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h
index 9564e93ca..fdf124aab 100644
--- a/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h
+++ b/src/blackgui/components/copymodelsfromotherswiftversionsdialog.h
@@ -17,7 +17,7 @@
 namespace Ui { class CCopyModelsFromOtherSwiftVersionsDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Copy models from other swift versions as dialog
      */
     class CCopyModelsFromOtherSwiftVersionsDialog : public QDialog
diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/blackgui/components/copysettingsandcachescomponent.h
index f34d79c1c..d7f9c1d66 100644
--- a/src/blackgui/components/copysettingsandcachescomponent.h
+++ b/src/blackgui/components/copysettingsandcachescomponent.h
@@ -41,7 +41,7 @@
 namespace Ui { class CCopySettingsAndCachesComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Copy settings and caches
      */
     class CCopySettingsAndCachesComponent : public COverlayMessagesFrame
@@ -140,7 +140,7 @@ namespace BlackGui::Components
         BlackMisc::CData<BlackMisc::Simulation::Data::TLastModel> m_cacheLastAircraftModel { this }; //!< recently used aircraft model
     };
 
-    /**
+    /*!
      * Wizard page for CCopySettingsAndCaches
      */
     class CCopySettingsAndCachesWizardPage : public QWizardPage
diff --git a/src/blackgui/components/coresettingsdialog.h b/src/blackgui/components/coresettingsdialog.h
index e2137804d..190a69873 100644
--- a/src/blackgui/components/coresettingsdialog.h
+++ b/src/blackgui/components/coresettingsdialog.h
@@ -18,7 +18,7 @@
 namespace Ui { class CCoreSettingsDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Core / swift pilot client settings as Dialog
      */
     class BLACKGUI_EXPORT CCoreSettingsDialog : public QDialog
diff --git a/src/blackgui/components/countryselector.h b/src/blackgui/components/countryselector.h
index beaa8e02b..5b2564cce 100644
--- a/src/blackgui/components/countryselector.h
+++ b/src/blackgui/components/countryselector.h
@@ -18,7 +18,7 @@
 namespace Ui { class CCountrySelector; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * @brief Select a valid country
      */
     class CCountrySelector : public QFrame
diff --git a/src/blackgui/components/datainfoareacomponent.h b/src/blackgui/components/datainfoareacomponent.h
index 6a1d6bf78..56e5bb999 100644
--- a/src/blackgui/components/datainfoareacomponent.h
+++ b/src/blackgui/components/datainfoareacomponent.h
@@ -33,7 +33,7 @@ namespace BlackGui::Components
     class CDbModelComponent;
     class CDbAircraftCategoryComponent;
 
-    /**
+    /*!
      * Info area containing the DB data (models, liveries ...)
      */
     class BLACKGUI_EXPORT CDataInfoAreaComponent :
diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/blackgui/components/datamaininfoareacomponent.h
index 1696af76f..292aa8e5a 100644
--- a/src/blackgui/components/datamaininfoareacomponent.h
+++ b/src/blackgui/components/datamaininfoareacomponent.h
@@ -29,7 +29,7 @@ namespace BlackGui::Components
     class CLogComponent;
     class CDataSettingsComponent;
 
-    /**
+    /*!
      * Main info area for data entry tool
      */
     class BLACKGUI_EXPORT CDataMainInfoAreaComponent :
diff --git a/src/blackgui/components/datasettingscomponent.h b/src/blackgui/components/datasettingscomponent.h
index ba3ee31ae..8edb1fed8 100644
--- a/src/blackgui/components/datasettingscomponent.h
+++ b/src/blackgui/components/datasettingscomponent.h
@@ -22,7 +22,7 @@ namespace Ui { class CDataSettingsComponent; }
 namespace BlackCore::Db { class CBackgroundDataUpdater; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Settings
      */
     class BLACKGUI_EXPORT CDataSettingsComponent : public COverlayMessagesFrame
diff --git a/src/blackgui/components/dbaircraftcategorycomponent.h b/src/blackgui/components/dbaircraftcategorycomponent.h
index 480616e7a..c1cb33232 100644
--- a/src/blackgui/components/dbaircraftcategorycomponent.h
+++ b/src/blackgui/components/dbaircraftcategorycomponent.h
@@ -22,7 +22,7 @@
 namespace Ui { class CDbAircraftCategoryComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * DB aircraft categories
      */
     class BLACKGUI_EXPORT CDbAircraftCategoryComponent :
diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/blackgui/components/dbaircrafticaocomponent.h
index 8e8d1f283..72dd493f3 100644
--- a/src/blackgui/components/dbaircrafticaocomponent.h
+++ b/src/blackgui/components/dbaircrafticaocomponent.h
@@ -27,7 +27,7 @@ namespace BlackGui
     namespace Views { class CAircraftIcaoCodeView; }
     namespace Components
     {
-        /**
+        /*!
          * DB aircraft ICAO data
          */
         class BLACKGUI_EXPORT CDbAircraftIcaoComponent :
diff --git a/src/blackgui/components/dbairlineicaocomponent.h b/src/blackgui/components/dbairlineicaocomponent.h
index 050549e1a..a169a7229 100644
--- a/src/blackgui/components/dbairlineicaocomponent.h
+++ b/src/blackgui/components/dbairlineicaocomponent.h
@@ -27,7 +27,7 @@ namespace BlackGui
     namespace Views { class CAirlineIcaoCodeView; }
     namespace Components
     {
-        /**
+        /*!
          * Airline ICAO code
          */
         class BLACKGUI_EXPORT CDbAirlineIcaoComponent :
diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.h b/src/blackgui/components/dbautosimulatorstashingcomponent.h
index 499c3c8a2..a0936d7a6 100644
--- a/src/blackgui/components/dbautosimulatorstashingcomponent.h
+++ b/src/blackgui/components/dbautosimulatorstashingcomponent.h
@@ -23,7 +23,7 @@
 namespace Ui { class CDbAutoSimulatorStashingComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Allows to automatically update models if found in own model set, but already existing
      * for a sibling simulator (ie. FSX/P3D/FS9)
      */
diff --git a/src/blackgui/components/dbdistributorcomponent.h b/src/blackgui/components/dbdistributorcomponent.h
index d8561f7ec..10bbee0bd 100644
--- a/src/blackgui/components/dbdistributorcomponent.h
+++ b/src/blackgui/components/dbdistributorcomponent.h
@@ -27,7 +27,7 @@ namespace BlackGui
     namespace Views { class CDistributorView; }
     namespace Components
     {
-        /**
+        /*!
          * Distributors
          */
         class BLACKGUI_EXPORT CDbDistributorComponent :
diff --git a/src/blackgui/components/dbloaddatadialog.h b/src/blackgui/components/dbloaddatadialog.h
index ed95daa23..056ca1a84 100644
--- a/src/blackgui/components/dbloaddatadialog.h
+++ b/src/blackgui/components/dbloaddatadialog.h
@@ -23,7 +23,7 @@
 namespace Ui { class CDbLoadDataDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Load data from DB as dialog
      */
     class BLACKGUI_EXPORT CDbLoadDataDialog : public QDialog
diff --git a/src/blackgui/components/dblogincomponent.h b/src/blackgui/components/dblogincomponent.h
index 312d1b9db..57ef5c403 100644
--- a/src/blackgui/components/dblogincomponent.h
+++ b/src/blackgui/components/dblogincomponent.h
@@ -25,7 +25,7 @@ namespace BlackMisc::Network { class CAuthenticatedUser; }
 namespace Ui { class CDbLoginComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Login to DB
      * \sa BlackCore::Db::CDatabaseAuthenticationService
      */
diff --git a/src/blackgui/components/dbmodelcomponent.h b/src/blackgui/components/dbmodelcomponent.h
index 32f26e7e5..f9564e1b7 100644
--- a/src/blackgui/components/dbmodelcomponent.h
+++ b/src/blackgui/components/dbmodelcomponent.h
@@ -26,7 +26,7 @@
 namespace Ui { class CDbModelComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Database models. Those are the models loaaded from the DB.
      */
     class BLACKGUI_EXPORT CDbModelComponent :
diff --git a/src/blackgui/components/dbmodelkeycompleter.h b/src/blackgui/components/dbmodelkeycompleter.h
index 597584fb5..f3e0fe84b 100644
--- a/src/blackgui/components/dbmodelkeycompleter.h
+++ b/src/blackgui/components/dbmodelkeycompleter.h
@@ -17,7 +17,7 @@
 
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Completer for model keys
      */
     class CDbModelKeyCompleter : public QLineEdit
diff --git a/src/blackgui/components/downloadcomponent.h b/src/blackgui/components/downloadcomponent.h
index 074b9654c..fe9369021 100644
--- a/src/blackgui/components/downloadcomponent.h
+++ b/src/blackgui/components/downloadcomponent.h
@@ -25,7 +25,7 @@
 namespace Ui { class CDownloadComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Download a file
      */
     class BLACKGUI_EXPORT CDownloadComponent :
diff --git a/src/blackgui/components/downloaddialog.h b/src/blackgui/components/downloaddialog.h
index 7d22bf84c..82269130c 100644
--- a/src/blackgui/components/downloaddialog.h
+++ b/src/blackgui/components/downloaddialog.h
@@ -21,7 +21,7 @@ namespace Ui { class CDownloadDialog; }
 namespace BlackMisc::Network { class CRemoteFile; class CRemoteFileList; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * CDownloadComponent as dialog
      */
     class BLACKGUI_EXPORT CDownloadDialog : public QDialog
diff --git a/src/blackgui/components/firstmodelsetdialog.h b/src/blackgui/components/firstmodelsetdialog.h
index cbe26a361..26a0df38f 100644
--- a/src/blackgui/components/firstmodelsetdialog.h
+++ b/src/blackgui/components/firstmodelsetdialog.h
@@ -17,7 +17,7 @@
 namespace Ui { class CFirstModelSetDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * First model set dialog
      */
     class CFirstModelSetDialog : public QDialog
diff --git a/src/blackgui/components/initialdataloadcomponent.h b/src/blackgui/components/initialdataloadcomponent.h
index 560f7d5a5..ba7d51005 100644
--- a/src/blackgui/components/initialdataloadcomponent.h
+++ b/src/blackgui/components/initialdataloadcomponent.h
@@ -18,7 +18,7 @@
 namespace Ui { class CInitialDataLoadComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Initial data load to prefill caches
      * \remark Normally used in wizard
      */
@@ -46,7 +46,7 @@ namespace BlackGui::Components
         QScopedPointer<Ui::CInitialDataLoadComponent> ui;
     };
 
-    /**
+    /*!
     * Wizard page for CInitialDataLoadComponent
     */
     class CInitialDataLoadWizardPage : public QWizardPage
diff --git a/src/blackgui/components/installsimulatorspecificwizardpage.h b/src/blackgui/components/installsimulatorspecificwizardpage.h
index 94f8ecc9d..c5d3f0fd2 100644
--- a/src/blackgui/components/installsimulatorspecificwizardpage.h
+++ b/src/blackgui/components/installsimulatorspecificwizardpage.h
@@ -19,7 +19,7 @@ namespace BlackGui::Components
     class CInstallXSwiftBusComponent;
     class CInstallFsxTerrainProbeComponent;
 
-    /**
+    /*!
      * Simulator specific installation
      */
     class CInstallSimulatorSpecificWizardPage : public COverlayMessagesWizardPage
diff --git a/src/blackgui/components/installxswiftbuscomponent.h b/src/blackgui/components/installxswiftbuscomponent.h
index 7e90d2928..ba239154f 100644
--- a/src/blackgui/components/installxswiftbuscomponent.h
+++ b/src/blackgui/components/installxswiftbuscomponent.h
@@ -26,7 +26,7 @@
 namespace Ui { class CInstallXSwiftBusComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Download and install XSwiftBus
      */
     class CInstallXSwiftBusComponent :
@@ -101,7 +101,7 @@ namespace BlackGui::Components
         void openDownloadDir();
     };
 
-    /**
+    /*!
      * Wizard page for CInstallXSwiftBusWizardPage
      */
     class CInstallXSwiftBusWizardPage : public QWizardPage
diff --git a/src/blackgui/components/installxswiftbusdialog.h b/src/blackgui/components/installxswiftbusdialog.h
index b1ce6f105..c122d0982 100644
--- a/src/blackgui/components/installxswiftbusdialog.h
+++ b/src/blackgui/components/installxswiftbusdialog.h
@@ -17,7 +17,7 @@
 namespace Ui { class CInstallXSwiftBusDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * CInstallXSwiftBusComponent as dialog
      */
     class CInstallXSwiftBusDialog : public QDialog
diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h
index 24ceba516..fc6c7b46c 100644
--- a/src/blackgui/components/interpolationlogdisplay.h
+++ b/src/blackgui/components/interpolationlogdisplay.h
@@ -30,7 +30,7 @@ namespace Ui { class CInterpolationLogDisplay; }
 namespace BlackCore  { class CAirspaceMonitor; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Display live data of interpolation
      */
     class BLACKGUI_EXPORT CInterpolationLogDisplay :
diff --git a/src/blackgui/components/interpolationlogdisplaydialog.h b/src/blackgui/components/interpolationlogdisplaydialog.h
index d1252c22b..ec2d00d82 100644
--- a/src/blackgui/components/interpolationlogdisplaydialog.h
+++ b/src/blackgui/components/interpolationlogdisplaydialog.h
@@ -23,7 +23,7 @@ namespace BlackCore
 namespace Ui { class CInterpolationLogDisplayDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * CInterpolationLogDisplay as dialog
      */
     class BLACKGUI_EXPORT CInterpolationLogDisplayDialog : public QDialog
diff --git a/src/blackgui/components/legalinfocomponent.h b/src/blackgui/components/legalinfocomponent.h
index 8bb54055b..30a22c3b3 100644
--- a/src/blackgui/components/legalinfocomponent.h
+++ b/src/blackgui/components/legalinfocomponent.h
@@ -20,7 +20,7 @@
 namespace Ui { class CLegalInfoComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * swift legal information
      */
     class CLegalInfoComponent : public COverlayMessagesFrame
@@ -54,7 +54,7 @@ namespace BlackGui::Components
         BlackMisc::CSetting<BlackCore::Application::TCrashDumpSettings> m_crashDumpSettings { this };
     };
 
-    /**
+    /*!
      * Wizard page for CLegalInfoComponent
      */
     class CLegalInfoWizardPage : public QWizardPage
diff --git a/src/blackgui/components/modelconverterxsetupcomponent.h b/src/blackgui/components/modelconverterxsetupcomponent.h
index 950d748c4..00ac5b8cd 100644
--- a/src/blackgui/components/modelconverterxsetupcomponent.h
+++ b/src/blackgui/components/modelconverterxsetupcomponent.h
@@ -17,7 +17,7 @@
 namespace Ui { class CModelConverterXSetupComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
     * Setup to start ModelConverterX
     */
     class CModelConverterXSetupComponent : public QFrame
diff --git a/src/blackgui/components/otherswiftversionscomponent.h b/src/blackgui/components/otherswiftversionscomponent.h
index e9307cf88..208e414db 100644
--- a/src/blackgui/components/otherswiftversionscomponent.h
+++ b/src/blackgui/components/otherswiftversionscomponent.h
@@ -18,7 +18,7 @@
 namespace Ui { class COtherSwiftVersionsComponent; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Overview about other "swift" versions
      */
     class COtherSwiftVersionsComponent : public QFrame
diff --git a/src/blackgui/components/otherswiftversionsdialog.h b/src/blackgui/components/otherswiftversionsdialog.h
index 835bd17b5..7f96e4b9e 100644
--- a/src/blackgui/components/otherswiftversionsdialog.h
+++ b/src/blackgui/components/otherswiftversionsdialog.h
@@ -17,7 +17,7 @@
 namespace Ui { class COtherSwiftVersionsDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * COtherVersionsComponent as dialog
      */
     class COtherSwiftVersionsDialog : public QDialog
diff --git a/src/blackgui/components/scalescreenfactor.h b/src/blackgui/components/scalescreenfactor.h
index 3b9cd7921..bc1050734 100644
--- a/src/blackgui/components/scalescreenfactor.h
+++ b/src/blackgui/components/scalescreenfactor.h
@@ -18,7 +18,7 @@
 namespace Ui { class CScaleScreenFactor; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * UI to scale screen factor
      */
     class BLACKGUI_EXPORT CScaleScreenFactor : public QFrame
diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/blackgui/components/settingshotkeycomponent.h
index a8e06a140..f4227de98 100644
--- a/src/blackgui/components/settingshotkeycomponent.h
+++ b/src/blackgui/components/settingshotkeycomponent.h
@@ -66,7 +66,7 @@ namespace BlackGui::Components
         BlackCore::CActionBind m_action { "/Test/Message", BlackMisc::CIcons::StandardIconWrench16, this, &CSettingsHotkeyComponent::hotkeySlot };
     };
 
-    /**
+    /*!
      * Wizard page for CConfigSimulatorComponent
      */
     class CConfigHotkeyWizardPage : public QWizardPage
diff --git a/src/blackgui/components/settingsswiftplugin.h b/src/blackgui/components/settingsswiftplugin.h
index 9145462bd..6797a0bed 100644
--- a/src/blackgui/components/settingsswiftplugin.h
+++ b/src/blackgui/components/settingsswiftplugin.h
@@ -18,7 +18,7 @@
 namespace Ui { class CSettingsSwiftPlugin; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Settings for the swift pseudo driver
      */
     class BLACKGUI_EXPORT CSettingsSwiftPlugin : public QFrame
diff --git a/src/blackgui/components/setuploadingdialog.h b/src/blackgui/components/setuploadingdialog.h
index f612ac61a..af3205b6e 100644
--- a/src/blackgui/components/setuploadingdialog.h
+++ b/src/blackgui/components/setuploadingdialog.h
@@ -19,7 +19,7 @@ namespace BlackGui::Components
 {
     class CCopyModelsFromOtherSwiftVersionsDialog;
 
-    /**
+    /*!
      * Setup dialog, if something goes wrong allows to copy bootstrap file
      */
     class CSetupLoadingDialog : public QDialog
diff --git a/src/blackgui/components/stringlistdialog.h b/src/blackgui/components/stringlistdialog.h
index 71f8d8ca7..5b94b3499 100644
--- a/src/blackgui/components/stringlistdialog.h
+++ b/src/blackgui/components/stringlistdialog.h
@@ -17,7 +17,7 @@
 namespace Ui { class CStringListDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Select from a list of string
      */
     class CStringListDialog : public QDialog
diff --git a/src/blackgui/components/transpondermodecomponent.h b/src/blackgui/components/transpondermodecomponent.h
index 3e6ba4b0a..4cdbe02b4 100644
--- a/src/blackgui/components/transpondermodecomponent.h
+++ b/src/blackgui/components/transpondermodecomponent.h
@@ -20,7 +20,7 @@ namespace Ui { class CTransponderModeComponent; }
 namespace BlackMisc { class CIdentifier; namespace Simulation { class CSimulatedAircraft; }}
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Small component to display XPDR mode
      */
     class CTransponderModeComponent : public QFrame, BlackMisc::CIdentifiable
diff --git a/src/blackgui/components/updateinfocomponent.h b/src/blackgui/components/updateinfocomponent.h
index c0d0247ec..80cbba495 100644
--- a/src/blackgui/components/updateinfocomponent.h
+++ b/src/blackgui/components/updateinfocomponent.h
@@ -25,7 +25,7 @@ namespace BlackGui::Components
     class CInstallXSwiftBusDialog;
     class CDownloadDialog;
 
-    /**
+    /*!
      * Update info (distributions, artifacts etc.)
      */
     class BLACKGUI_EXPORT CUpdateInfoComponent : public QFrame
diff --git a/src/blackgui/components/updateinfodialog.h b/src/blackgui/components/updateinfodialog.h
index 5c203052d..4b5463d2b 100644
--- a/src/blackgui/components/updateinfodialog.h
+++ b/src/blackgui/components/updateinfodialog.h
@@ -18,7 +18,7 @@
 namespace Ui { class CUpdateInfoDialog; }
 namespace BlackGui::Components
 {
-    /**
+    /*!
      * Download and install swift
      */
     class BLACKGUI_EXPORT CUpdateInfoDialog : public QDialog
diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index 379154cbd..8f8602d2c 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -302,7 +302,7 @@ namespace BlackGui
         this->setFrameless(!frameless);
     }
 
-    /**
+    /*!
     void CDockWidget::toggleFramelessDeferred(int delayMs)
     {
         QPointer<CDockWidget> myself(this);
diff --git a/src/blackgui/editors/aircraftmodelform.h b/src/blackgui/editors/aircraftmodelform.h
index b0ea6fbee..211d84a83 100644
--- a/src/blackgui/editors/aircraftmodelform.h
+++ b/src/blackgui/editors/aircraftmodelform.h
@@ -19,7 +19,7 @@
 namespace Ui { class CAircraftModelForm; }
 namespace BlackGui::Editors
 {
-    /**
+    /*!
      * Combined form of Livery, ICAOs, distributor
      */
     class CAircraftModelForm : public CForm
diff --git a/src/blackgui/editors/aircraftpartsform.h b/src/blackgui/editors/aircraftpartsform.h
index 546da65ad..920ff38b8 100644
--- a/src/blackgui/editors/aircraftpartsform.h
+++ b/src/blackgui/editors/aircraftpartsform.h
@@ -21,7 +21,7 @@ class QWidget;
 namespace Ui { class CAircraftPartsForm; }
 namespace BlackGui::Editors
 {
-    /**
+    /*!
      * Edit and set aircraft parts
      */
     class BLACKGUI_EXPORT CAircraftPartsForm : public CForm
diff --git a/src/blackgui/editors/coordinateform.h b/src/blackgui/editors/coordinateform.h
index 06e1278bd..676b405d1 100644
--- a/src/blackgui/editors/coordinateform.h
+++ b/src/blackgui/editors/coordinateform.h
@@ -19,7 +19,7 @@
 namespace Ui { class CCoordinateForm; }
 namespace BlackGui::Editors
 {
-    /**
+    /*!
      * Select / enter a geo position
      */
     class BLACKGUI_EXPORT CCoordinateForm : public CForm
diff --git a/src/blackgui/editors/situationform.h b/src/blackgui/editors/situationform.h
index e7bc5eaec..7474bfc12 100644
--- a/src/blackgui/editors/situationform.h
+++ b/src/blackgui/editors/situationform.h
@@ -20,7 +20,7 @@
 namespace Ui { class CSituationForm; }
 namespace BlackGui::Editors
 {
-    /**
+    /*!
      * Selector / entry
      */
     class BLACKGUI_EXPORT CSituationForm : public CForm
diff --git a/src/blackgui/elidedpushbutton.h b/src/blackgui/elidedpushbutton.h
index a4a0f6f27..1bd4cac0b 100644
--- a/src/blackgui/elidedpushbutton.h
+++ b/src/blackgui/elidedpushbutton.h
@@ -15,7 +15,7 @@
 
 namespace BlackGui
 {
-    /**
+    /*!
      * Push button with elided text
      * \remark based on http://doc.qt.io/qt-5/qtwidgets-widgets-elidedlabel-example.html
      */
diff --git a/src/blackgui/graphs/barchart.h b/src/blackgui/graphs/barchart.h
index c09209d53..efaceda58 100644
--- a/src/blackgui/graphs/barchart.h
+++ b/src/blackgui/graphs/barchart.h
@@ -23,7 +23,7 @@
 
 namespace BlackGui::Graphs
 {
-    /**
+    /*!
      * For axis labels
      */
     class CTextScaleDraw: public QwtScaleDraw
@@ -45,7 +45,7 @@ namespace BlackGui::Graphs
         QStringList m_labels;
     };
 
-    /**
+    /*!
      * Bar chart, modified version of QWT examples
      */
     class BLACKGUI_EXPORT CBarChart: public QwtPlot
diff --git a/src/blackgui/pluginconfig.h b/src/blackgui/pluginconfig.h
index d21d5361a..fac3d0012 100644
--- a/src/blackgui/pluginconfig.h
+++ b/src/blackgui/pluginconfig.h
@@ -21,7 +21,7 @@ namespace BlackGui
 {
     class CPluginConfigWindow;
 
-    /**
+    /*!
      * The interface for the plugin config.
      * The plugin config plugin is always called from the GUI process in order
      * to make it possible to create a config window.
diff --git a/src/blackgui/pluginconfigwindow.h b/src/blackgui/pluginconfigwindow.h
index e816efe78..fe8382172 100644
--- a/src/blackgui/pluginconfigwindow.h
+++ b/src/blackgui/pluginconfigwindow.h
@@ -18,7 +18,7 @@ class QShowEvent;
 
 namespace BlackGui
 {
-    /**
+    /*!
      * Base class for plugin config window.
      */
     class BLACKGUI_EXPORT CPluginConfigWindow : public COverlayMessagesFrame
diff --git a/src/blackgui/sharedstringlistcompleter.h b/src/blackgui/sharedstringlistcompleter.h
index f35b9e9a4..96a49682b 100644
--- a/src/blackgui/sharedstringlistcompleter.h
+++ b/src/blackgui/sharedstringlistcompleter.h
@@ -56,7 +56,7 @@ namespace BlackGui
         QStringListModel *getCompleterModel() const;
     };
 
-    /**
+    /*!
      * Utility functions
      */
     class BLACKGUI_EXPORT CompleterUtils
diff --git a/src/blackgui/singleapplicationui.h b/src/blackgui/singleapplicationui.h
index 1f1cf9843..e0103867b 100644
--- a/src/blackgui/singleapplicationui.h
+++ b/src/blackgui/singleapplicationui.h
@@ -17,7 +17,7 @@ class QWidget;
 
 namespace BlackGui
 {
-    /**
+    /*!
      * Enable / disable UI depending on how many swift applications are running
      */
     class CSingleApplicationUi
diff --git a/src/blackgui/splashscreen.h b/src/blackgui/splashscreen.h
index fcb707ad7..e3be11226 100644
--- a/src/blackgui/splashscreen.h
+++ b/src/blackgui/splashscreen.h
@@ -21,7 +21,7 @@
 
 namespace BlackGui
 {
-    /**
+    /*!
      * Own splash screen
      */
     class CSplashScreen : public QSplashScreen
diff --git a/src/blackgui/views/aircraftmodelvalidationdialog.h b/src/blackgui/views/aircraftmodelvalidationdialog.h
index 82013a016..d7608c6c0 100644
--- a/src/blackgui/views/aircraftmodelvalidationdialog.h
+++ b/src/blackgui/views/aircraftmodelvalidationdialog.h
@@ -18,7 +18,7 @@
 namespace Ui { class CAircraftModelValidationDialog; }
 namespace BlackGui::Views
 {
-    /**
+    /*!
      * Model validation
      * \remark there is also a more specific validation version BlackGui::Components::CAircraftModelSetValidationDialog
      */
diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h
index 85f6a824f..c7d5204d8 100644
--- a/src/blackmisc/pq/measurementunit.h
+++ b/src/blackmisc/pq/measurementunit.h
@@ -397,7 +397,7 @@ namespace BlackMisc::PhysicalQuantities
             return U::defaultUnit();
         }
 
-        /**
+        /*!
          * All symbols
          */
         template <class U> static const QStringList &allSymbols()
@@ -414,7 +414,7 @@ namespace BlackMisc::PhysicalQuantities
             return symbols;
         }
 
-        /**
+        /*!
          * All symbols case insensitive
          */
         template <class U> static const QStringList &allSymbolsLowerCase()
@@ -431,7 +431,7 @@ namespace BlackMisc::PhysicalQuantities
             return symbols;
         }
 
-        /**
+        /*!
          * Are symbols case sensitive?
          */
         template <class U> static bool hasCaseSensitiveSymbols()
diff --git a/src/blackmisc/simulation/interpolatormulti.h b/src/blackmisc/simulation/interpolatormulti.h
index 599284db1..f6689a040 100644
--- a/src/blackmisc/simulation/interpolatormulti.h
+++ b/src/blackmisc/simulation/interpolatormulti.h
@@ -49,7 +49,7 @@ namespace BlackMisc::Simulation
         CInterpolatorLinear m_linear;
     };
 
-    /**
+    /*!
      * CInterpolatorMulti which can be used with QMap/QHash
      * \remark Use case is emulated driver
      */
diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
index cd0fd83d4..094090e14 100644
--- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
+++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
@@ -27,7 +27,7 @@ namespace BlackSimPlugin::Emulated
 {
     class CSimulatorEmulated;
 
-    /**
+    /*!
      * Monitor widget for the pseudo driver
      */
     class CSimulatorEmulatedMonitorDialog : public QDialog, public BlackMisc::CIdentifiable
diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
index d5502670e..662e8a18f 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
@@ -17,7 +17,7 @@
 namespace Ui { class CSimulatorEmulatedConfigWidget; }
 namespace BlackSimPlugin::Emulated
 {
-    /**
+    /*!
      * Configuration window for CSimulatorEmulatedConfig
      */
     class Q_DECL_EXPORT CSimulatorEmulatedConfigWidget : public BlackGui::CPluginConfigWindow
diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
index 6b8b70558..d6ae3f014 100644
--- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
+++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
@@ -20,7 +20,7 @@
 namespace Ui { class CSimulatorFlightgearConfigWindow; }
 namespace BlackSimPlugin::Flightgear
 {
-    /**
+    /*!
      * A window that shows all the Flightgear plugin options.
      */
     class CSimulatorFlightgearConfigWindow : public BlackGui::CPluginConfigWindow
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
index 67e9dc347..a5fad2db2 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
@@ -19,7 +19,7 @@
 namespace Ui { class CSimulatorFsxConfigWindow; }
 namespace BlackSimPlugin::FsxCommon
 {
-    /**
+    /*!
      * A window that lets user set up the FSX plugin.
      */
     class FSXCOMMON_EXPORT CSimulatorFsxConfigWindow : public BlackGui::CPluginConfigWindow
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
index fa187efba..eea8f624b 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
@@ -20,7 +20,7 @@
 namespace Ui { class CSimulatorXPlaneConfigWindow; }
 namespace BlackSimPlugin::XPlane
 {
-    /**
+    /*!
      * A window that shows all the X-Plane plugin options.
      */
     class CSimulatorXPlaneConfigWindow : public BlackGui::CPluginConfigWindow