diff --git a/assert/AssertFailed.h b/assert/AssertFailed.h
index f5566427..5e9d398c 100644
--- a/assert/AssertFailed.h
+++ b/assert/AssertFailed.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_ASSERT_ASSERTFAILED_H
-#define MESSMER_CPP_UTILS_ASSERT_ASSERTFAILED_H
+#ifndef MESSMER_CPPUTILS_ASSERT_ASSERTFAILED_H
+#define MESSMER_CPPUTILS_ASSERT_ASSERTFAILED_H
 
 #include <stdexcept>
 #include <string>
diff --git a/assert/assert.h b/assert/assert.h
index 23f35ccc..761e27c8 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_ASSERT_ASSERT_H
-#define MESSMER_CPP_UTILS_ASSERT_ASSERT_H
+#ifndef MESSMER_CPPUTILS_ASSERT_ASSERT_H
+#define MESSMER_CPPUTILS_ASSERT_ASSERT_H
 
 /**
  * This implements an ASSERT(expr, msg) macro.
diff --git a/assert/backtrace.h b/assert/backtrace.h
index 0a11003b..4d7ca1a7 100644
--- a/assert/backtrace.h
+++ b/assert/backtrace.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_ASSERT_BACKTRACE_H
 #define MESSMER_CPPUTILS_ASSERT_BACKTRACE_H
 
diff --git a/daemon/daemonize.h b/daemon/daemonize.h
index f9034be6..5e7b142d 100644
--- a/daemon/daemonize.h
+++ b/daemon/daemonize.h
@@ -1,5 +1,6 @@
-#ifndef CPPUTILS_DAEMON_DAEMONIZE_H
-#define CPPUTILS_DAEMON_DAEMONIZE_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_DAEMON_DAEMONIZE_H
+#define MESSMER_CPPUTILS_DAEMON_DAEMONIZE_H
 
 namespace cpputils {
     void daemonize();
diff --git a/data/DataFixture.h b/data/DataFixture.h
index bab9bbc6..1da57344 100644
--- a/data/DataFixture.h
+++ b/data/DataFixture.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_DATA_DATAFIXTURE_H_
-#define MESSMER_CPP_UTILS_DATA_DATAFIXTURE_H_
+#ifndef MESSMER_CPPUTILS_DATA_DATAFIXTURE_H_
+#define MESSMER_CPPUTILS_DATA_DATAFIXTURE_H_
 
 #include "Data.h"
 
diff --git a/either.h b/either.h
index 2fc466f1..907c2409 100644
--- a/either.h
+++ b/either.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_EITHER_H
-#define MESSMER_CPP_UTILS_EITHER_H
+#ifndef MESSMER_CPPUTILS_EITHER_H
+#define MESSMER_CPPUTILS_EITHER_H
 
 #include <boost/optional.hpp>
 
diff --git a/io/pipestream.h b/io/pipestream.h
index 8e17e66a..96d07af4 100644
--- a/io/pipestream.h
+++ b/io/pipestream.h
@@ -22,7 +22,7 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 //  OTHER DEALINGS IN THE SOFTWARE.
 // ----------------------------------------------------------------------------
-
+#pragma once
 #ifndef MESSMER_CPPUTILS_PIPESTREAM_H
 #define MESSMER_CPPUTILS_PIPESTREAM_H
 
diff --git a/lock/ConditionBarrier.h b/lock/ConditionBarrier.h
index e776d5c8..bce0c7ac 100644
--- a/lock/ConditionBarrier.h
+++ b/lock/ConditionBarrier.h
@@ -1,5 +1,6 @@
-#ifndef MESSMER_CPPUTILS_CONDITIONBARRIER_H
-#define MESSMER_CPPUTILS__CONDITIONBARRIER_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_LOCK_CONDITIONBARRIER_H
+#define MESSMER_CPPUTILS_LOCK_CONDITIONBARRIER_H
 
 #include <mutex>
 #include <condition_variable>
diff --git a/lock/LockPool.h b/lock/LockPool.h
index d5dbb774..bbcee468 100644
--- a/lock/LockPool.h
+++ b/lock/LockPool.h
@@ -1,5 +1,6 @@
-#ifndef MESSMER_CPPUTILS_LOCKPOOL_H
-#define MESSMER_CPPUTILS_LOCKPOOL_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_LOCK_LOCKPOOL_H
+#define MESSMER_CPPUTILS_LOCK_LOCKPOOL_H
 
 #include <mutex>
 #include <condition_variable>
diff --git a/lock/MutexPoolLock.h b/lock/MutexPoolLock.h
index a77953c3..d70ba3af 100644
--- a/lock/MutexPoolLock.h
+++ b/lock/MutexPoolLock.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_LOCK_MUTEXPOOLLOCK_H
 #define MESSMER_CPPUTILS_LOCK_MUTEXPOOLLOCK_H
 
diff --git a/macros.h b/macros.h
index 71e7c684..c1fc1f8a 100644
--- a/macros.h
+++ b/macros.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_MACROS_H_
-#define MESSMER_CPP_UTILS_MACROS_H_
+#ifndef MESSMER_CPPUTILS_MACROS_H_
+#define MESSMER_CPPUTILS_MACROS_H_
 
 /**
  * Disallow the copy and assignment constructors of a class
diff --git a/pointer/cast.h b/pointer/cast.h
index 7b243cbc..be45ab87 100644
--- a/pointer/cast.h
+++ b/pointer/cast.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_CAST_H_
-#define MESSMER_CPP_UTILS_POINTER_CAST_H_
+#ifndef MESSMER_CPPUTILS_POINTER_CAST_H_
+#define MESSMER_CPPUTILS_POINTER_CAST_H_
 
 #include <memory>
 
diff --git a/pointer/optional_ownership_ptr.h b/pointer/optional_ownership_ptr.h
index 3f321661..fb90d639 100644
--- a/pointer/optional_ownership_ptr.h
+++ b/pointer/optional_ownership_ptr.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
-#define MESSMER_CPP_UTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
+#ifndef MESSMER_CPPUTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
+#define MESSMER_CPPUTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
 
 #include "unique_ref.h"
 #include <functional>
diff --git a/pointer/unique_ref.h b/pointer/unique_ref.h
index d3be60a0..bee77221 100644
--- a/pointer/unique_ref.h
+++ b/pointer/unique_ref.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_H
-#define MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_H
+#ifndef MESSMER_CPPUTILS_POINTER_UNIQUE_REF_H
+#define MESSMER_CPPUTILS_POINTER_UNIQUE_REF_H
 
 #include <memory>
 #include <boost/optional.hpp>
diff --git a/pointer/unique_ref_boost_optional_gtest_workaround.h b/pointer/unique_ref_boost_optional_gtest_workaround.h
index d92376cf..736e82ce 100644
--- a/pointer/unique_ref_boost_optional_gtest_workaround.h
+++ b/pointer/unique_ref_boost_optional_gtest_workaround.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
-#define MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
+#ifndef MESSMER_CPPUTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
+#define MESSMER_CPPUTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
 
 /**
  * This is a workaround for using boost::optional<unique_ref<T>> in gtest.
diff --git a/tempfile/TempDir.h b/tempfile/TempDir.h
index 4e8c3e59..cd465810 100644
--- a/tempfile/TempDir.h
+++ b/tempfile/TempDir.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_TEMPFILE_TEMPDIR_H_
-#define MESSMER_TEMPFILE_TEMPDIR_H_
+#ifndef MESSMER_CPPUTILS_TEMPFILE_TEMPDIR_H_
+#define MESSMER_CPPUTILS_TEMPFILE_TEMPDIR_H_
 
 #include <boost/filesystem.hpp>
 #include "../macros.h"
diff --git a/tempfile/TempFile.h b/tempfile/TempFile.h
index 01288215..7d5fc956 100644
--- a/tempfile/TempFile.h
+++ b/tempfile/TempFile.h
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_TEMPFILE_TEMPFILE_H_
-#define MESSMER_TEMPFILE_TEMPFILE_H_
+#ifndef MESSMER_CPPUTILS_TEMPFILE_TEMPFILE_H_
+#define MESSMER_CPPUTILS_TEMPFILE_TEMPFILE_H_
 
 #include <boost/filesystem.hpp>
 #include "../macros.h"
diff --git a/test/io/ConsoleTest.h b/test/io/ConsoleTest.h
index 71981a97..05e65f1c 100644
--- a/test/io/ConsoleTest.h
+++ b/test/io/ConsoleTest.h
@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_TEST_IO_CONSOLETEST_H
 #define MESSMER_CPPUTILS_TEST_IO_CONSOLETEST_H