Index: /trunk/FACT++/src/HeadersTNGWeather.h
===================================================================
--- /trunk/FACT++/src/HeadersTNGWeather.h	(revision 13921)
+++ /trunk/FACT++/src/HeadersTNGWeather.h	(revision 13921)
@@ -0,0 +1,35 @@
+#ifndef FACT_HeadersTNGWeather
+#define FACT_HeadersTNGWeather
+
+namespace TNGWeather
+{
+    namespace State
+    {
+        enum states_t
+        {
+            kDisconnected = 1,
+            kConnected,
+            kReceiving,
+        };
+    }
+
+    struct DimWeather
+    {
+        DimWeather() { memset(this, 0, sizeof(DimWeather)); }
+
+        float fTemp10M;
+        float fTemp5M;
+        float fTemp2M;
+        float fTempGround;
+        float fDewPoint;
+        float fHumidity;
+        float fAirPressure;
+        float fWindSpeed;
+        float fWindDirection;
+        float fDeltaM1;
+        float fDustTotal;
+        float fSeeing;
+
+    } __attribute__((__packed__));
+};
+#endif
Index: /trunk/FACT++/src/tngweather.cc
===================================================================
--- /trunk/FACT++/src/tngweather.cc	(revision 13920)
+++ /trunk/FACT++/src/tngweather.cc	(revision 13921)
@@ -19,4 +19,6 @@
 #include "tools.h"
 
+#include "HeadersTNGWeather.h"
+
 #include <Soprano/Soprano>
 
@@ -26,28 +28,6 @@
 
 using namespace std;
-
-// ------------------------------------------------------------------------
-
-struct DimWeather
-{
-    DimWeather() { memset(this, 0, sizeof(DimWeather)); }
-
-    float fTemp10M;
-    float fTemp5M;
-    float fTemp2M;
-    float fTempGround;
-    float fDewPoint;
-    float fHumidity;
-    float fAirPressure;
-    float fWindSpeed;
-    float fWindDirection;
-    float fDeltaM1;
-    float fDustTotal;
-    float fSeeing;
-
-} __attribute__((__packed__));
-
-
-// ------------------------------------------------------------------------
+using namespace TNGWeather;
+
 
 class ConnectionWeather : public Connection
@@ -420,11 +400,4 @@
     S fWeather;
 
-    enum states_t
-    {
-        kStateDisconnected = 1,
-        kStateConnected,
-        kStateReceiving,
-    };
-
     bool CheckEventSize(size_t has, const char *name, size_t size)
     {
@@ -500,11 +473,11 @@
 
         // State names
-        AddStateName(kStateDisconnected, "NoConnection",
+        T::AddStateName(State::kDisconnected, "NoConnection",
                      "No connection to web-server could be established recently");
 
-        AddStateName(kStateConnected, "Invalid",
+        T::AddStateName(State::kConnected, "Invalid",
                      "Connection to webserver can be established, but received data is not recent or invalid");
 
-        AddStateName(kStateReceiving, "Valid",
+        T::AddStateName(State::kReceiving, "Valid",
                      "Connection to webserver can be established, receint data received");