diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp
index 36bd9658c..8528be953 100644
--- a/src/blackcore/vatsim/networkvatlib.cpp
+++ b/src/blackcore/vatsim/networkvatlib.cpp
@@ -25,7 +25,7 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/geo/latitude.h"
 #include "blackmisc/geo/longitude.h"
-#include "blackmisc/network/network.h"
+#include "blackmisc/network/fsdsetup.h"
 #include "blackmisc/network/textmessage.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/angle.h"
@@ -977,7 +977,7 @@ namespace BlackCore
                 CSpeed::null() // There is no speed information in a interim packet
             );
             situation.setCurrentUtcTime();
-            situation.setTimeOffsetMs(c_interimPositionTimeOffsetMsec);
+            situation.setTimeOffsetMs(CFsdSetup::c_interimPositionTimeOffsetMsec);
             situation.setInterimFlag(true);
             self->receivedPositionFixTsAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch());
 
@@ -1192,15 +1192,15 @@ namespace BlackCore
             if (!m_lastPositionUpdate.contains(callsign))
             {
                 m_lastPositionUpdate.insert(callsign, markerTs);
-                return c_positionTimeOffsetMsec;
+                return CFsdSetup::c_positionTimeOffsetMsec;
             }
             const qint64 oldTs = m_lastPositionUpdate.value(callsign);
             m_lastPositionUpdate[callsign] = markerTs;
 
             const qint64 diff = oldTs - markerTs;
-            const qint64 offsetTime = (oldTs > 0 && diff > 0 && diff < c_interimPositionTimeOffsetMsec) ?
-                                      c_interimPositionTimeOffsetMsec :
-                                      c_positionTimeOffsetMsec;
+            const qint64 offsetTime = (oldTs > 0 && diff > 0 && diff < CFsdSetup::c_interimPositionTimeOffsetMsec) ?
+                                      CFsdSetup::c_interimPositionTimeOffsetMsec :
+                                      CFsdSetup::c_positionTimeOffsetMsec;
             m_lastOffsetTime[callsign] = offsetTime;
             return offsetTime;
         }
@@ -1209,7 +1209,7 @@ namespace BlackCore
         {
             Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
 
-            if (!m_lastOffsetTime.contains(callsign)) { return c_positionTimeOffsetMsec; }
+            if (!m_lastOffsetTime.contains(callsign)) { return CFsdSetup::c_positionTimeOffsetMsec; }
             return m_lastOffsetTime.value(callsign);
         }
 
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index ea504bdd4..510769206 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -132,12 +132,6 @@ namespace BlackCore
             //! Command line options this library can handle
             static const QList<QCommandLineOption> &getCmdLineOptions();
 
-            //! Offset times basically telling when to expect the next value from network plus some reserve
-            //! @{
-            static qint64 constexpr c_positionTimeOffsetMsec = 6000;        //!< offset time for received position updates
-            static qint64 constexpr c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates
-            //! @}
-
         private:
             static int constexpr c_processingIntervalMsec = 100;            //!< interval for the processing timer
             static int constexpr c_updatePostionIntervalMsec = 5000;        //!< interval for the position update timer (send our position to network)
diff --git a/src/blackmisc/network/fsdsetup.h b/src/blackmisc/network/fsdsetup.h
index 63b1241f7..28cb648ea 100644
--- a/src/blackmisc/network/fsdsetup.h
+++ b/src/blackmisc/network/fsdsetup.h
@@ -56,6 +56,12 @@ namespace BlackMisc
             };
             Q_DECLARE_FLAGS(SendReceiveDetails, SendReceiveDetailsFlag)
 
+            //! Offset times basically telling when to expect the next value from network plus some reserve
+            //! @{
+            static qint64 constexpr c_positionTimeOffsetMsec = 6000;        //!< offset time for received position updates
+            static qint64 constexpr c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates
+            //! @}
+
             //! Default constructor.
             CFsdSetup() {}
 
diff --git a/tests/blackmisc/testaircraftsituation.cpp b/tests/blackmisc/testaircraftsituation.cpp
index 9ecad17fb..49bc05989 100644
--- a/tests/blackmisc/testaircraftsituation.cpp
+++ b/tests/blackmisc/testaircraftsituation.cpp
@@ -15,18 +15,18 @@
  */
 
 #include "testaircraftsituation.h"
+#include "blackmisc/network/fsdsetup.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackcore/vatsim/networkvatlib.h"
 
 #include <QTest>
 #include <QDateTime>
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
+using namespace BlackMisc::Network;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Math;
-using namespace BlackCore::Vatsim;
 
 namespace BlackMiscTest
 {