diff --git a/include/internal/catch_timer.h b/include/internal/catch_timer.h
index fb61846c16..607aa6bb29 100644
--- a/include/internal/catch_timer.h
+++ b/include/internal/catch_timer.h
@@ -10,15 +10,20 @@
 
 #include "catch_platform.h"
 
-#include <stdint.h>
+#ifdef _MSC_VER
 
 namespace Catch {
-#ifdef _MSC_VER
     typedef unsigned long long UInt64;
+}
 #else
+#include <stdint.h>
+namespace Catch {
     typedef uint64_t UInt64;
+}
 #endif
 
+
+namespace Catch {
     class Timer {
     public:
         Timer() : m_ticks( 0 ) {}