diff --git a/Makefile.am b/Makefile.am
index 0f5893cb..b76be4d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ UTIL_FILES   =		\
     point.hpp		\
     pool.cpp		\
     pool.hpp		\
+    preprocessor.hpp	\
     random.cpp		\
     random.hpp		\
     range.cpp		\
diff --git a/debug.hpp b/debug.hpp
index b88ebc47..44f7d806 100644
--- a/debug.hpp
+++ b/debug.hpp
@@ -28,9 +28,6 @@
 #include <iostream>
 #include <sstream>
 
-#define CONCATENATE_DETAIL(x, y) x##y
-#define CONCATENATE(x, y) CONCATENATE_DETAIL(x, y)
-#define raii CONCATENATE(unique, __COUNTER__)
 
 #define trace {                                                 \
     std::cerr << __FILE__ << ":" << __func__ << ":" << __LINE__ << std::endl;  \
diff --git a/preprocessor.h b/preprocessor.hpp
similarity index 86%
rename from preprocessor.h
rename to preprocessor.hpp
index c6e0357f..dee7a40b 100644
--- a/preprocessor.h
+++ b/preprocessor.hpp
@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with libgim.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2012 Danny Robson <danny@blubinc.net>
+ * Copyright 2012 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __PREPROCESSOR_HPP
-#define __PREPROCESSOR_HPP
+#ifndef __UTIL_PREPROCESSOR_HPP
+#define __UTIL_PREPROCESSOR_HPP
 
 #define CONCATENATE_DETAIL(x, y) x##y
 #define CONCATENATE(x, y) CONCATENATE_DETAIL(x, y)