diff --git a/asio_compatibility.hpp b/asio_compatibility.hpp
index d37e348..2a29e5c 100644
--- a/asio_compatibility.hpp
+++ b/asio_compatibility.hpp
@@ -1,5 +1,5 @@
-#ifndef SIMPLE_WEB_ASIO_HPP
-#define SIMPLE_WEB_ASIO_HPP
+#ifndef SIMPLE_WEB_ASIO_COMPATIBILITY_HPP
+#define SIMPLE_WEB_ASIO_COMPATIBILITY_HPP
 
 #include <memory>
 
@@ -68,4 +68,4 @@ namespace SimpleWeb {
 #endif
 } // namespace SimpleWeb
 
-#endif /* SIMPLE_WEB_ASIO_HPP */
+#endif /* SIMPLE_WEB_ASIO_COMPATIBILITY_HPP */
diff --git a/client_http.hpp b/client_http.hpp
index 128b01f..e5bb113 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -1,5 +1,5 @@
-#ifndef CLIENT_HTTP_HPP
-#define CLIENT_HTTP_HPP
+#ifndef SIMPLE_WEB_CLIENT_HTTP_HPP
+#define SIMPLE_WEB_CLIENT_HTTP_HPP
 
 #include "asio_compatibility.hpp"
 #include "mutex.hpp"
@@ -798,4 +798,4 @@ namespace SimpleWeb {
   };
 } // namespace SimpleWeb
 
-#endif /* CLIENT_HTTP_HPP */
+#endif /* SIMPLE_WEB_CLIENT_HTTP_HPP */
diff --git a/client_https.hpp b/client_https.hpp
index ccbb6e2..864cc61 100644
--- a/client_https.hpp
+++ b/client_https.hpp
@@ -1,5 +1,5 @@
-#ifndef CLIENT_HTTPS_HPP
-#define CLIENT_HTTPS_HPP
+#ifndef SIMPLE_WEB_CLIENT_HTTPS_HPP
+#define SIMPLE_WEB_CLIENT_HTTPS_HPP
 
 #include "client_http.hpp"
 
@@ -139,4 +139,4 @@ namespace SimpleWeb {
   };
 } // namespace SimpleWeb
 
-#endif /* CLIENT_HTTPS_HPP */
+#endif /* SIMPLE_WEB_CLIENT_HTTPS_HPP */
diff --git a/server_http.hpp b/server_http.hpp
index c4741fd..cece89c 100644
--- a/server_http.hpp
+++ b/server_http.hpp
@@ -1,5 +1,5 @@
-#ifndef SERVER_HTTP_HPP
-#define SERVER_HTTP_HPP
+#ifndef SIMPLE_WEB_SERVER_HTTP_HPP
+#define SIMPLE_WEB_SERVER_HTTP_HPP
 
 #include "asio_compatibility.hpp"
 #include "mutex.hpp"
@@ -793,4 +793,4 @@ namespace SimpleWeb {
   };
 } // namespace SimpleWeb
 
-#endif /* SERVER_HTTP_HPP */
+#endif /* SIMPLE_WEB_SERVER_HTTP_HPP */
diff --git a/server_https.hpp b/server_https.hpp
index b371df5..477b333 100644
--- a/server_https.hpp
+++ b/server_https.hpp
@@ -1,5 +1,5 @@
-#ifndef SERVER_HTTPS_HPP
-#define SERVER_HTTPS_HPP
+#ifndef SIMPLE_WEB_SERVER_HTTPS_HPP
+#define SIMPLE_WEB_SERVER_HTTPS_HPP
 
 #include "server_http.hpp"
 
@@ -82,4 +82,4 @@ namespace SimpleWeb {
   };
 } // namespace SimpleWeb
 
-#endif /* SERVER_HTTPS_HPP */
+#endif /* SIMPLE_WEB_SERVER_HTTPS_HPP */
diff --git a/tests/assert.hpp b/tests/assert.hpp
index 552d4b7..7d55ec7 100644
--- a/tests/assert.hpp
+++ b/tests/assert.hpp
@@ -1,9 +1,9 @@
-#ifndef TESTS_ASSERT_HPP
-#define TESTS_ASSERT_HPP
+#ifndef SIMPLE_WEB_ASSERT_HPP
+#define SIMPLE_WEB_ASSERT_HPP
 
 #include <cstdlib>
 #include <iostream>
 
 #define ASSERT(e) ((void)((e) ? ((void)0) : ((void)(std::cerr << "Assertion failed: (" << #e << "), function " << __func__ << ", file " << __FILE__ << ", line " << __LINE__ << ".\n"), std::abort())))
 
-#endif /* TESTS_ASSERT_HPP */
+#endif /* SIMPLE_WEB_ASSERT_HPP */