diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.cpp b/src/blackmisc/simulation/settings/xswiftbussettings.cpp
index 0dd8a378b..8df8c8c53 100644
--- a/src/blackmisc/simulation/settings/xswiftbussettings.cpp
+++ b/src/blackmisc/simulation/settings/xswiftbussettings.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "xswiftbussettings.h"
+#include "xswiftbussettingsqtfree.hpp"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
index 2d761d10a..b5ba625f8 100644
--- a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
+++ b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.h
@@ -10,7 +10,9 @@
 #define BLACKMISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
 
 #include "blackmisc/simulation/xplane/qtfreeutils.h"
+
 #include <string>
+#include <chrono>
 
 namespace BlackMisc
 {
@@ -26,10 +28,10 @@ namespace BlackMisc
             {
             protected:
                 //! Constructor.
-                CXSwiftBusSettingsQtFree();
+                CXSwiftBusSettingsQtFree() {}
 
                 //! Destructor.
-                ~CXSwiftBusSettingsQtFree() = default;
+                virtual ~CXSwiftBusSettingsQtFree() {}
 
             public:
                 //! DBus server
@@ -132,7 +134,12 @@ namespace BlackMisc
                 int update(const CXSwiftBusSettingsQtFree &newValues);
 
                 //! Sets timestamp to now
-                virtual void setCurrentUtcTime();
+                virtual void setCurrentUtcTime()
+                {
+                    using namespace std::chrono;
+                    const milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
+                    m_msSinceEpochQtFree = static_cast<int64_t>(ms.count());
+                }
 
             protected:
                 //! The JSON members @{
diff --git a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp
similarity index 95%
rename from src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp
rename to src/blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp
index 79ea90993..a4cdfa796 100644
--- a/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp
+++ b/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp
@@ -37,9 +37,6 @@ namespace BlackMisc
     {
         namespace Settings
         {
-            CXSwiftBusSettingsQtFree::CXSwiftBusSettingsQtFree()
-            {}
-
             bool CXSwiftBusSettingsQtFree::parseXSwiftBusString(const std::string &json)
             {
                 if (json.empty()) { return false; }
@@ -152,12 +149,6 @@ namespace BlackMisc
                 return changed;
             }
 
-            void CXSwiftBusSettingsQtFree::setCurrentUtcTime()
-            {
-                using namespace std::chrono;
-                const milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
-                m_msSinceEpochQtFree = static_cast<int64_t>(ms.count());
-            }
         } // ns
     } // ns
 } // ns
diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp
index 5f50134d0..97dbbf27f 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.cpp
+++ b/src/plugins/simulator/xplane/simulatorxplane.cpp
@@ -15,6 +15,7 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
 #include "blackmisc/weather/cloudlayer.h"
 #include "blackmisc/weather/cloudlayerlist.h"
 #include "blackmisc/weather/gridpoint.h"
diff --git a/src/xswiftbus/settings.cpp b/src/xswiftbus/settings.cpp
index f0a268e57..aa67aef85 100644
--- a/src/xswiftbus/settings.cpp
+++ b/src/xswiftbus/settings.cpp
@@ -6,10 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-// include whole code in this translation unit, as this code is used on swift/and XSWiftBus side
-// BLACKMISC_EXPORT cannot be used
-#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp"
-
+#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
 #include "settings.h"
 #include <string>
 
diff --git a/tests/blackmisc/simulation/testxplane/testxplane.cpp b/tests/blackmisc/simulation/testxplane/testxplane.cpp
index a61c0a34d..b6632e6b4 100644
--- a/tests/blackmisc/simulation/testxplane/testxplane.cpp
+++ b/tests/blackmisc/simulation/testxplane/testxplane.cpp
@@ -12,6 +12,7 @@
 
 #include "blackmisc/simulation/xplane/qtfreeutils.h"
 #include "blackmisc/simulation/settings/xswiftbussettings.h"
+#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
 #include "blackmisc/directoryutils.h"
 #include "test.h"