diff --git a/bazaar/Timer/Timer.cpp b/bazaar/Timer/Timer.cpp
index 509be7f52..9e2b67ebd 100644
--- a/bazaar/Timer/Timer.cpp
+++ b/bazaar/Timer/Timer.cpp
@@ -1,6 +1,7 @@
 #include "Timer.h"
 
-// #define LOG_QUEUE
+using namespace Upp;
+
 #define LLOG(x) // LOG(x)
 
 Timer::Timer()
diff --git a/bazaar/Timer/Timer.h b/bazaar/Timer/Timer.h
index b79cd1a09..6cd278d91 100644
--- a/bazaar/Timer/Timer.h
+++ b/bazaar/Timer/Timer.h
@@ -3,7 +3,7 @@
 
 #include <Core/Core.h>
 
-using namespace Upp;
+namespace Upp {
 
 //runs a chained list of TimerEvent stored Callbacks after sleeping
 class Timer
@@ -61,4 +61,6 @@ private:
 	//LinkOwner<TimeEvent> flist; //unused elements for reuse
 };
 
+}
+
 #endif
diff --git a/bazaar/TimerTest/TimerTest.h b/bazaar/TimerTest/TimerTest.h
index 1a9f5f4f8..ea30836e0 100644
--- a/bazaar/TimerTest/TimerTest.h
+++ b/bazaar/TimerTest/TimerTest.h
@@ -2,13 +2,13 @@
 #define _TimerTest_TimerTest_h
 
 #include <CtrlLib/CtrlLib.h>
+#include <Timer/Timer.h>
 
-using namespace Upp;
+namespace Upp {
 
 #define LAYOUTFILE <TimerTest/TimerTest.lay>
 #include <CtrlCore/lay.h>
 
-#include <Timer/Timer.h>
 
 class TimerTest : public WithLayout<TopWindow> {
 public:
@@ -26,5 +26,6 @@ private:
 	Atomic demo;
 };
 
-#endif
+}
 
+#endif
diff --git a/bazaar/TimerTest/main.cpp b/bazaar/TimerTest/main.cpp
index 4aad35ce4..b87f11189 100644
--- a/bazaar/TimerTest/main.cpp
+++ b/bazaar/TimerTest/main.cpp
@@ -3,6 +3,8 @@
 #define REPEAT_TEST
 #define TIMEOUT 1000
 
+using namespace Upp;
+
 TimerTest::TimerTest()
 	: demo(0)
 {