1 files changed, 23 insertions, 1 deletions
diff --git a/tests/state-fixture.h b/tests/state-fixture.h
index 7d8358e..e466a79 100644
--- a/tests/state-fixture.h
+++ b/tests/state-fixture.h
@@ -17,18 +17,30 @@
  *   Charles Kerr <charles.kerr@canonical.com>
  */
 
+#ifndef INDICATOR_DATETIME_TESTS_STATE_FIXTURE_H
+#define INDICATOR_DATETIME_TESTS_STATE_FIXTURE_H
+
 #include "glib-fixture.h"
 
 #include "actions-mock.h"
 #include "state-mock.h"
 
-using namespace unity::indicator::datetime;
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/***
+****
+***/
 
 class StateFixture: public GlibFixture
 {
 private:
     typedef GlibFixture super;
 
+public:
+    virtual ~StateFixture() =default;
+
 protected:
     std::shared_ptr<MockState> m_mock_state;
     std::shared_ptr<State> m_state;
@@ -56,5 +68,15 @@ protected:
 
         super::TearDown();
     }
+
 };
 
+/***
+****
+***/
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif /* INDICATOR_DATETIME_TESTS_STATE_FIXTURE_H */