diff --git a/callable.hpp b/callable.hpp
index 91e687c..0f9ddf0 100644
--- a/callable.hpp
+++ b/callable.hpp
@@ -1,10 +1,9 @@
-#ifndef CANVAS_CALLABLE_HPP
-#define CANVAS_CALLABLE_HPP
+#ifndef CALLABLE_HPP
+#define CALLABLE_HPP
 
 #include <functional>
 #include <memory>
 
-namespace ce {
 /* Base interface template for a member function pointer object
  */
 template <class Return, class... Args>
@@ -64,6 +63,5 @@ template <class Return, class... Args> Return Callable<Return, Args...>::call(Ar
 template <class Return, class... Args> bool operator==(Callable<Return, Args...> const &lhs, Callable<Return, Args...> const &rhs) {
     return lhs.hidden->equals(*rhs.hidden.get());
 }
-}
 
-#endif // !CANVAS_CALLABLE_HPP
+#endif // !CALLABLE_HPP
diff --git a/signal.hpp b/signal.hpp
index 8acc3f0..a2c94d3 100644
--- a/signal.hpp
+++ b/signal.hpp
@@ -1,11 +1,10 @@
-#ifndef CANVAS_SIGNAL_HPP
-#define CANVAS_SIGNAL_HPP
+#ifndef SIGNAL_HPP
+#define SIGNAL_HPP
 
 #include "callable.hpp"
 #include <cstdio>
 #include <vector>
 
-namespace ce {
 /*! Observer-listener implementation
  */
 template <class... Args>
@@ -60,6 +59,5 @@ void TEST_signals() {
     signal.invoke(10);
 }
 #endif
-}
 
 #endif // !CANVAS_SIGNAL_HPP