diff --git a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp
index 3aa05ecb7..330f73dee 100644
--- a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp
+++ b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp
@@ -79,6 +79,6 @@ namespace BlackMisc
                     ts << "dbusPort = " << m_dbusPort << endl;
                 }
             }
-        }
-    }
-}
+        } // ns
+    } // ns
+} // ns
diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp
index 10078f792..c5c53e22f 100644
--- a/src/xswiftbus/traffic.cpp
+++ b/src/xswiftbus/traffic.cpp
@@ -63,7 +63,7 @@ namespace XSwiftBus
         cleanup();
     }
 
-    bool s_legacyDataOK = true;
+    static bool s_legacyDataOK = true;
 
     void CTraffic::setPlaneViewMenu(const CMenu &planeViewSubMenu)
     {
@@ -204,8 +204,8 @@ namespace XSwiftBus
         m_followPlaneViewCallsign = *callsignIt;
     }
 
-    int g_maxPlanes = 100;
-    float g_drawDistance = 50.0f;
+    static int g_maxPlanes = 100;
+    static float g_drawDistance = 50.0f;
 
     int CTraffic::preferences(const char *section, const char *name, int def)
     {
@@ -483,7 +483,7 @@ namespace XSwiftBus
         removeAllPlanes();
     }
 
-    const char *introspection_traffic =
+    static const char *introspection_traffic =
         DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
 #include "org.swift_project.xswiftbus.traffic.xml"
         ;