diff --git a/include/wsfs.h b/include/wsfs.h
index cb5b507..c91c007 100644
--- a/include/wsfs.h
+++ b/include/wsfs.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_H
-#define _WSFS_H
+#ifndef WSFS_H
+#define WSFS_H
 
 #include "wsfs/api.h"
 #include "wsfs/server.h"
diff --git a/include/wsfs/api.h b/include/wsfs/api.h
index 6dec2b6..79af7a9 100644
--- a/include/wsfs/api.h
+++ b/include/wsfs/api.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_API_H
-#define _WSFS_API_H
+#ifndef WSFS_API_H
+#define WSFS_API_H
 
 #ifndef WSFS_API
 #define WSFS_API
diff --git a/include/wsfs/server.h b/include/wsfs/server.h
index b155dd1..6ab716d 100644
--- a/include/wsfs/server.h
+++ b/include/wsfs/server.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_SERVER_H
-#define _WSFS_SERVER_H
+#ifndef WSFS_SERVER_H
+#define WSFS_SERVER_H
 
 #include "wsfs/api.h"
 
diff --git a/include/wsfs/server_config.h b/include/wsfs/server_config.h
index 9c100e4..be9d953 100644
--- a/include/wsfs/server_config.h
+++ b/include/wsfs/server_config.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_SERVER_CONFIG_H
-#define _WSFS_SERVER_CONFIG_H
+#ifndef WSFS_SERVER_CONFIG_H
+#define WSFS_SERVER_CONFIG_H
 
 #include "wsfs/api.h"
 
diff --git a/include/wsfs/server_protocol.h b/include/wsfs/server_protocol.h
index d5a9e9d..61b575f 100644
--- a/include/wsfs/server_protocol.h
+++ b/include/wsfs/server_protocol.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_SERVER_PROTOCOL_H
-#define _WSFS_SERVER_PROTOCOL_H
+#ifndef WSFS_SERVER_PROTOCOL_H
+#define WSFS_SERVER_PROTOCOL_H
 
 #include "wsfs/api.h"
 
diff --git a/include/wsfs_provider.h b/include/wsfs_provider.h
index 6601a40..a9377ea 100644
--- a/include/wsfs_provider.h
+++ b/include/wsfs_provider.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_H
-#define _WSFSP_H
+#ifndef WSFSP_H
+#define WSFSP_H
 
 #include "wsfsp/api.h"
 #include "wsfsp/provider.h"
diff --git a/include/wsfsp/api.h b/include/wsfsp/api.h
index c7e0554..5b8a0c9 100644
--- a/include/wsfsp/api.h
+++ b/include/wsfsp/api.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_API_H
-#define _WSFSP_API_H
+#ifndef WSFSP_API_H
+#define WSFSP_API_H
 
 #ifndef WSFSP_API
 #define WSFSP_API
diff --git a/include/wsfsp/client.h b/include/wsfsp/client.h
index d31ddb4..7c2e8bb 100644
--- a/include/wsfsp/client.h
+++ b/include/wsfsp/client.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_CLIENT_H
-#define _WSFSP_CLIENT_H
+#ifndef WSFSP_CLIENT_H
+#define WSFSP_CLIENT_H
 
 #include "wsfsp/api.h"
 
diff --git a/include/wsfsp/client_protocol.h b/include/wsfsp/client_protocol.h
index c296801..f3ca91f 100644
--- a/include/wsfsp/client_protocol.h
+++ b/include/wsfsp/client_protocol.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_CLIENT_PROTOCOL_H
-#define _WSFSP_CLIENT_PROTOCOL_H
+#ifndef WSFSP_CLIENT_PROTOCOL_H
+#define WSFSP_CLIENT_PROTOCOL_H
 
 #include "wsfsp/api.h"
 
diff --git a/include/wsfsp/provider.h b/include/wsfsp/provider.h
index ad9388c..3274780 100644
--- a/include/wsfsp/provider.h
+++ b/include/wsfsp/provider.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSp_H
-#define _WSFSp_H
+#ifndef WSFSP_PROVIDER_H
+#define WSFSP_PROVIDER_H
 
 #ifndef __cplusplus
 #include <stddef.h>
diff --git a/lib/wsfs/filesystem.h b/lib/wsfs/filesystem.h
index 12a6366..6cdca70 100644
--- a/lib/wsfs/filesystem.h
+++ b/lib/wsfs/filesystem.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_FILESYSTEM_H
-#define _WSFS_FILESYSTEM_H
+#ifndef WSFS_FILESYSTEM_H
+#define WSFS_FILESYSTEM_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/fuse_wrapper.h b/lib/wsfs/fuse_wrapper.h
index 648f00d..5c6317b 100644
--- a/lib/wsfs/fuse_wrapper.h
+++ b/lib/wsfs/fuse_wrapper.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_FUSE_H
-#define _WSFS_FUSE_H
+#ifndef WSFS_FUSE_H
+#define WSFS_FUSE_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/wsfs/jsonrpc/method.h b/lib/wsfs/jsonrpc/method.h
index e7eb77d..f8c7b45 100644
--- a/lib/wsfs/jsonrpc/method.h
+++ b/lib/wsfs/jsonrpc/method.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSONRPC_METHOD_H
-#define _WSFS_JSONRPC_METHOD_H
+#ifndef WSFS_JSONRPC_METHOD_H
+#define WSFS_JSONRPC_METHOD_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/jsonrpc/method_intern.h b/lib/wsfs/jsonrpc/method_intern.h
index 39928b0..b23281e 100644
--- a/lib/wsfs/jsonrpc/method_intern.h
+++ b/lib/wsfs/jsonrpc/method_intern.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSONRPC_METHOD_INTERN_H
-#define _WSFS_JSONRPC_METHOD_INTERN_H
+#ifndef WSFS_JSONRPC_METHOD_INTERN_H
+#define WSFS_JSONRPC_METHOD_INTERN_H
 
 #include "wsfs/jsonrpc/method.h"
 
diff --git a/lib/wsfs/jsonrpc/request.h b/lib/wsfs/jsonrpc/request.h
index 5d194ba..468f2eb 100644
--- a/lib/wsfs/jsonrpc/request.h
+++ b/lib/wsfs/jsonrpc/request.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSONRPC_REQUEST_H
-#define _WSFS_JSONRPC_REQUEST_H
+#ifndef WSFS_JSONRPC_REQUEST_H
+#define WSFS_JSONRPC_REQUEST_H
 
 #ifndef __cplusplus
 #include <stdarg.h>
diff --git a/lib/wsfs/jsonrpc/response.h b/lib/wsfs/jsonrpc/response.h
index 9e0e0cb..b1f217b 100644
--- a/lib/wsfs/jsonrpc/response.h
+++ b/lib/wsfs/jsonrpc/response.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSONRPC_RESPONSE_H
-#define _WSFS_JSONRPC_RESPONSE_H
+#ifndef WSFS_JSONRPC_RESPONSE_H
+#define WSFS_JSONRPC_RESPONSE_H
 
 #ifndef __cplusplus
 #include <stddef.h>
diff --git a/lib/wsfs/jsonrpc/server.h b/lib/wsfs/jsonrpc/server.h
index 029292a..e21ef62 100644
--- a/lib/wsfs/jsonrpc/server.h
+++ b/lib/wsfs/jsonrpc/server.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSONRPC_SERVER_H
-#define _WSFS_JSONRPC_SERVER_H
+#ifndef WSFS_JSONRPC_SERVER_H
+#define WSFS_JSONRPC_SERVER_H
 
 #ifndef __cplusplus
 #include <stdarg.h>
diff --git a/lib/wsfs/jsonrpc/util.h b/lib/wsfs/jsonrpc/util.h
index 5bbc05b..4ff4698 100644
--- a/lib/wsfs/jsonrpc/util.h
+++ b/lib/wsfs/jsonrpc/util.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_JSON_UTIL_H
-#define _WSFS_JSON_UTIL_H
+#ifndef WSFS_JSON_UTIL_H
+#define WSFS_JSON_UTIL_H
 
 #include <jansson.h>
 
diff --git a/lib/wsfs/message.h b/lib/wsfs/message.h
index a8e3bcc..c2cc2b6 100644
--- a/lib/wsfs/message.h
+++ b/lib/wsfs/message.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_MESSAGE_H
-#define _WSFS_MESSAGE_H
+#ifndef WSFS_MESSAGE_H
+#define WSFS_MESSAGE_H
 
 #ifndef __cplusplus
 #include <stddef.h>
diff --git a/lib/wsfs/message_queue.h b/lib/wsfs/message_queue.h
index 92d92d7..5715505 100644
--- a/lib/wsfs/message_queue.h
+++ b/lib/wsfs/message_queue.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_MESSAGE_QUEUE_H
-#define _WSFS_MESSAGE_QUEUE_H
+#ifndef WSFS_MESSAGE_QUEUE_H
+#define WSFS_MESSAGE_QUEUE_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/operations.h b/lib/wsfs/operations.h
index 1ae083b..e0ccb33 100644
--- a/lib/wsfs/operations.h
+++ b/lib/wsfs/operations.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_OPERATIONS
-#define _WSFS_OPERATIONS
+#ifndef WSFS_OPERATIONS
+#define WSFS_OPERATIONS
 
 #include "wsfs/fuse_wrapper.h"
 
diff --git a/lib/wsfs/server_protocol_intern.h b/lib/wsfs/server_protocol_intern.h
index 3897bde..e979e17 100644
--- a/lib/wsfs/server_protocol_intern.h
+++ b/lib/wsfs/server_protocol_intern.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_SERVER_PROTOCOL_INTERN_H
-#define _WSFS_SERVER_PROTOCOL_INTERN_H
+#ifndef WSFS_SERVER_PROTOCOL_INTERN_H
+#define WSFS_SERVER_PROTOCOL_INTERN_H
 
 #include "wsfs/server_protocol.h"
 #include "wsfs/filesystem.h"
diff --git a/lib/wsfs/status.h b/lib/wsfs/status.h
index 06f6876..89164c4 100644
--- a/lib/wsfs/status.h
+++ b/lib/wsfs/status.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_STATUS_H
-#define _WSFS_STATUS_H
+#ifndef WSFS_STATUS_H
+#define WSFS_STATUS_H
 
 #define WSFS_GOOD 0
 #define WSFS_BAD  1
diff --git a/lib/wsfs/time/timeout_manager.h b/lib/wsfs/time/timeout_manager.h
index 81381c0..db6bf95 100644
--- a/lib/wsfs/time/timeout_manager.h
+++ b/lib/wsfs/time/timeout_manager.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TIME_TIMEOUT_MANAGER_H
-#define _WSFS_TIME_TIMEOUT_MANAGER_H
+#ifndef WSFS_TIME_TIMEOUT_MANAGER_H
+#define WSFS_TIME_TIMEOUT_MANAGER_H
 
 struct wsfs_timer;
 struct wsfs_timeout_manager
diff --git a/lib/wsfs/time/timeout_manager_intern.h b/lib/wsfs/time/timeout_manager_intern.h
index 3bf8357..2ef4228 100644
--- a/lib/wsfs/time/timeout_manager_intern.h
+++ b/lib/wsfs/time/timeout_manager_intern.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
-#define _WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
+#ifndef WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
+#define WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
 
 #include "wsfs/time/timeout_manager.h"
 
diff --git a/lib/wsfs/time/timepoint.h b/lib/wsfs/time/timepoint.h
index 3723159..1912c3a 100644
--- a/lib/wsfs/time/timepoint.h
+++ b/lib/wsfs/time/timepoint.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TIME_TIMEPOINT_H
-#define _WSFS_TIME_TIMEPOINT_H
+#ifndef WSFS_TIME_TIMEPOINT_H
+#define WSFS_TIME_TIMEPOINT_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/time/timer.h b/lib/wsfs/time/timer.h
index 4c7d9a3..ba983ef 100644
--- a/lib/wsfs/time/timer.h
+++ b/lib/wsfs/time/timer.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TIMER_H
-#define _WSFS_TIMER_H
+#ifndef WSFS_TIMER_H
+#define WSFS_TIMER_H
 
 #include "wsfs/time/timepoint.h"
 
diff --git a/lib/wsfs/time/timer_intern.h b/lib/wsfs/time/timer_intern.h
index 09c431c..73e3068 100644
--- a/lib/wsfs/time/timer_intern.h
+++ b/lib/wsfs/time/timer_intern.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TIME_TIMER_INTERN_H
-#define _WSFS_TIME_TIMER_INTERN_H
+#ifndef WSFS_TIME_TIMER_INTERN_H
+#define WSFS_TIME_TIMER_INTERN_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/util.h b/lib/wsfs/util.h
index 3146097..25f728d 100644
--- a/lib/wsfs/util.h
+++ b/lib/wsfs/util.h
@@ -1,5 +1,5 @@
-#ifndef _WSFS_UTIL_H
-#define _WSFS_UTIL_H
+#ifndef WSFS_UTIL_H
+#define WSFS_UTIL_H
 
 #ifdef __GNUC__
 #define WSFS_UNUSED_PARAM(param) param __attribute__((unused))
diff --git a/lib/wsfsp/client_protocol_intern.h b/lib/wsfsp/client_protocol_intern.h
index 61005b4..4fda97f 100644
--- a/lib/wsfsp/client_protocol_intern.h
+++ b/lib/wsfsp/client_protocol_intern.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_CLIENT_PROTOCOL_INTERN_H
-#define _WSFSP_CLIENT_PROTOCOL_INTERN_H
+#ifndef WSFSP_CLIENT_PROTOCOL_INTERN_H
+#define WSFSP_CLIENT_PROTOCOL_INTERN_H
 
 #include "wsfsp/client_protocol.h"
 #include "wsfsp/provider.h"
diff --git a/lib/wsfsp/provider_default.h b/lib/wsfsp/provider_default.h
index 3afeee1..96d3671 100644
--- a/lib/wsfsp/provider_default.h
+++ b/lib/wsfsp/provider_default.h
@@ -1,5 +1,5 @@
-#ifndef _WSFSP_PROVIDER_DEFAULT_H
-#define _WSFSP_PROVIDER_DEFAULT_H
+#ifndef WSFSP_PROVIDER_DEFAULT_H
+#define WSFSP_PROVIDER_DEFAULT_H
 
 #include "wsfsp/provider.h"
 
diff --git a/test/msleep.hpp b/test/msleep.hpp
index ee0d79d..6d53e3c 100644
--- a/test/msleep.hpp
+++ b/test/msleep.hpp
@@ -1,5 +1,5 @@
-#ifndef _WSFS_TEST_MSLEEP_HPP
-#define _WSFS_TEST_MSLEEP_HPP
+#ifndef WSFS_TEST_MSLEEP_HPP
+#define WSFS_TEST_MSLEEP_HPP
 
 namespace wsfs_test
 {