diff --git a/ProFUSE/Exception.cpp b/ProFUSE/Exception.cpp
index ee0cbee..3dad581 100644
--- a/ProFUSE/Exception.cpp
+++ b/ProFUSE/Exception.cpp
@@ -1,5 +1,5 @@
 
-#include "Exception.h"
+#include <ProFUSE/Exception.h>
 
 using namespace ProFUSE;
 
diff --git a/ProFUSE/Lock.cpp b/ProFUSE/Lock.cpp
index ddd9fa4..0b6013b 100644
--- a/ProFUSE/Lock.cpp
+++ b/ProFUSE/Lock.cpp
@@ -1,4 +1,6 @@
-#include "Lock.h"
+#include <ProfUSE/Lock.h>
+
+using namespace ProFUSE;
 
 Lock::Lock()
 {
diff --git a/ProFUSE/Lock.h b/ProFUSE/Lock.h
index cbb3bc7..8e32a80 100644
--- a/ProFUSE/Lock.h
+++ b/ProFUSE/Lock.h
@@ -3,6 +3,8 @@
 
 #include <pthread.h>
 
+namespace ProFUSE {
+
 class Lock {
 public:
     Lock();
@@ -25,4 +27,7 @@ private:
     Lock &_lock;
 };
 
-#endif
\ No newline at end of file
+
+}
+
+#endif
diff --git a/ProFUSE/auto.h b/ProFUSE/auto.h
index f23c3c2..1137687 100644
--- a/ProFUSE/auto.h
+++ b/ProFUSE/auto.h
@@ -1,6 +1,8 @@
 #ifndef __AUTO_H__
 #define __AUTO_H__
 
+namespace ProFUSE {
+
 template <class T>
 class auto_array
 {
@@ -94,6 +96,7 @@ private:
 };
 #endif
 
+}
 
 #endif