diff --git a/include/wsfs/adapter/api.h b/include/wsfs/adapter/api.h
index 79af7a9..d718a1f 100644
--- a/include/wsfs/adapter/api.h
+++ b/include/wsfs/adapter/api.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_API_H
-#define WSFS_API_H
+#ifndef WSFS_ADAPTER_API_H
+#define WSFS_ADAPTER_API_H
 
 #ifndef WSFS_API
 #define WSFS_API
diff --git a/include/wsfs/adapter/server.h b/include/wsfs/adapter/server.h
index b7aad3b..820221c 100644
--- a/include/wsfs/adapter/server.h
+++ b/include/wsfs/adapter/server.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_SERVER_H
-#define WSFS_SERVER_H
+#ifndef WSFS_ADAPTER_SERVER_H
+#define WSFS_ADAPTER_SERVER_H
 
 #include "wsfs/adapter/api.h"
 
diff --git a/include/wsfs/adapter/server_config.h b/include/wsfs/adapter/server_config.h
index 10c1c28..e8e9f73 100644
--- a/include/wsfs/adapter/server_config.h
+++ b/include/wsfs/adapter/server_config.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_SERVER_CONFIG_H
-#define WSFS_SERVER_CONFIG_H
+#ifndef WSFS_ADAPTER_SERVER_CONFIG_H
+#define WSFS_ADAPTER_SERVER_CONFIG_H
 
 #include "wsfs/adapter/api.h"
 
diff --git a/include/wsfs/adapter/server_protocol.h b/include/wsfs/adapter/server_protocol.h
index aef0a78..cdb27b7 100644
--- a/include/wsfs/adapter/server_protocol.h
+++ b/include/wsfs/adapter/server_protocol.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_SERVER_PROTOCOL_H
-#define WSFS_SERVER_PROTOCOL_H
+#ifndef WSFS_ADAPTER_SERVER_PROTOCOL_H
+#define WSFS_ADAPTER_SERVER_PROTOCOL_H
 
 #include "wsfs/adapter/api.h"
 
diff --git a/include/wsfs/provider/api.h b/include/wsfs/provider/api.h
index 5b8a0c9..4935bf2 100644
--- a/include/wsfs/provider/api.h
+++ b/include/wsfs/provider/api.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_API_H
-#define WSFSP_API_H
+#ifndef WSFSP_PROVIDER_API_H
+#define WSFSP_PROVIDER_API_H
 
 #ifndef WSFSP_API
 #define WSFSP_API
diff --git a/include/wsfs/provider/client.h b/include/wsfs/provider/client.h
index b339054..570679d 100644
--- a/include/wsfs/provider/client.h
+++ b/include/wsfs/provider/client.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_CLIENT_H
-#define WSFSP_CLIENT_H
+#ifndef WSFS_PROVIDER_CLIENT_H
+#define WSFS_PROVIDER_CLIENT_H
 
 #include "wsfs/provider/api.h"
 
diff --git a/include/wsfs/provider/client_protocol.h b/include/wsfs/provider/client_protocol.h
index d28039c..49410f5 100644
--- a/include/wsfs/provider/client_protocol.h
+++ b/include/wsfs/provider/client_protocol.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_CLIENT_PROTOCOL_H
-#define WSFSP_CLIENT_PROTOCOL_H
+#ifndef WSFS_PROVIDER_CLIENT_PROTOCOL_H
+#define WSFS_PROVIDER_CLIENT_PROTOCOL_H
 
 #include "wsfs/provider/api.h"
 
diff --git a/include/wsfs/provider/dirbuffer.h b/include/wsfs/provider/dirbuffer.h
index aa562d8..39b8a56 100644
--- a/include/wsfs/provider/dirbuffer.h
+++ b/include/wsfs/provider/dirbuffer.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_DIRBUFFER_H
-#define WSFSP_DIRBUFFER_H
+#ifndef WSFS_PROVIDER_DIRBUFFER_H
+#define WSFS_PROVIDER_DIRBUFFER_H
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/include/wsfs/provider/provider.h b/include/wsfs/provider/provider.h
index b2108ee..25d624d 100644
--- a/include/wsfs/provider/provider.h
+++ b/include/wsfs/provider/provider.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_PROVIDER_H
-#define WSFSP_PROVIDER_H
+#ifndef WSFS_PROVIDER_PROVIDER_H
+#define WSFS_PROVIDER_PROVIDER_H
 
 #include <wsfs/provider/operation/lookup.h>
 #include <wsfs/provider/operation/getattr.h>
diff --git a/include/wsfs_adapter.h b/include/wsfs_adapter.h
index 583dc32..c6f1d00 100644
--- a/include/wsfs_adapter.h
+++ b/include/wsfs_adapter.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_H
-#define WSFS_H
+#ifndef WSFS_ADAPTER_H
+#define WSFS_ADAPTER_H
 
 #include <wsfs/adapter/api.h>
 #include <wsfs/adapter/server.h>
diff --git a/include/wsfs_provider.h b/include/wsfs_provider.h
index 49ce3a2..c6ff25f 100644
--- a/include/wsfs_provider.h
+++ b/include/wsfs_provider.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_H
-#define WSFSP_H
+#ifndef WSFS_PROVIDER_H
+#define WSFS_PROVIDER_H
 
 #include <wsfs/provider/api.h>
 #include <wsfs/provider/client.h>
diff --git a/lib/wsfs/adapter/filesystem.h b/lib/wsfs/adapter/filesystem.h
index f238afc..a88ac9d 100644
--- a/lib/wsfs/adapter/filesystem.h
+++ b/lib/wsfs/adapter/filesystem.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_FILESYSTEM_H
-#define WSFS_FILESYSTEM_H
+#ifndef WSFS_ADAPTER_FILESYSTEM_H
+#define WSFS_ADAPTER_FILESYSTEM_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/adapter/fuse_wrapper.h b/lib/wsfs/adapter/fuse_wrapper.h
index 5c6317b..2f8d72b 100644
--- a/lib/wsfs/adapter/fuse_wrapper.h
+++ b/lib/wsfs/adapter/fuse_wrapper.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_FUSE_H
-#define WSFS_FUSE_H
+#ifndef WSFS_ADAPTER_FUSE_H
+#define WSFS_ADAPTER_FUSE_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/wsfs/adapter/jsonrpc/method.h b/lib/wsfs/adapter/jsonrpc/method.h
index 0c836a6..00f52c7 100644
--- a/lib/wsfs/adapter/jsonrpc/method.h
+++ b/lib/wsfs/adapter/jsonrpc/method.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSONRPC_METHOD_H
-#define WSFS_JSONRPC_METHOD_H
+#ifndef WSFS_ADAPTER_JSONRPC_METHOD_H
+#define WSFS_ADAPTER_JSONRPC_METHOD_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/adapter/jsonrpc/method_intern.h b/lib/wsfs/adapter/jsonrpc/method_intern.h
index b54a396..e1fb46e 100644
--- a/lib/wsfs/adapter/jsonrpc/method_intern.h
+++ b/lib/wsfs/adapter/jsonrpc/method_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSONRPC_METHOD_INTERN_H
-#define WSFS_JSONRPC_METHOD_INTERN_H
+#ifndef WSFS_ADAPTER_JSONRPC_METHOD_INTERN_H
+#define WSFS_ADAPTER_JSONRPC_METHOD_INTERN_H
 
 #include "wsfs/adapter/jsonrpc/method.h"
 
diff --git a/lib/wsfs/adapter/jsonrpc/request.h b/lib/wsfs/adapter/jsonrpc/request.h
index 468f2eb..9f28c48 100644
--- a/lib/wsfs/adapter/jsonrpc/request.h
+++ b/lib/wsfs/adapter/jsonrpc/request.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSONRPC_REQUEST_H
-#define WSFS_JSONRPC_REQUEST_H
+#ifndef WSFS_ADAPTER_JSONRPC_REQUEST_H
+#define WSFS_ADAPTER_JSONRPC_REQUEST_H
 
 #ifndef __cplusplus
 #include <stdarg.h>
diff --git a/lib/wsfs/adapter/jsonrpc/response.h b/lib/wsfs/adapter/jsonrpc/response.h
index e9ab5ea..3e10022 100644
--- a/lib/wsfs/adapter/jsonrpc/response.h
+++ b/lib/wsfs/adapter/jsonrpc/response.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSONRPC_RESPONSE_H
-#define WSFS_JSONRPC_RESPONSE_H
+#ifndef WSFS_ADAPTER_JSONRPC_RESPONSE_H
+#define WSFS_ADAPTER_JSONRPC_RESPONSE_H
 
 #ifndef __cplusplus
 #include <stddef.h>
diff --git a/lib/wsfs/adapter/jsonrpc/server.h b/lib/wsfs/adapter/jsonrpc/server.h
index 7f1ef09..0ebff63 100644
--- a/lib/wsfs/adapter/jsonrpc/server.h
+++ b/lib/wsfs/adapter/jsonrpc/server.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSONRPC_SERVER_H
-#define WSFS_JSONRPC_SERVER_H
+#ifndef WSFS_ADAPTER_JSONRPC_SERVER_H
+#define WSFS_ADAPTER_JSONRPC_SERVER_H
 
 #ifndef __cplusplus
 #include <stdarg.h>
diff --git a/lib/wsfs/adapter/jsonrpc/util.h b/lib/wsfs/adapter/jsonrpc/util.h
index 4ff4698..23370cd 100644
--- a/lib/wsfs/adapter/jsonrpc/util.h
+++ b/lib/wsfs/adapter/jsonrpc/util.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_JSON_UTIL_H
-#define WSFS_JSON_UTIL_H
+#ifndef WSFS_ADAPTER_JSON_UTIL_H
+#define WSFS_ADAPTER_JSON_UTIL_H
 
 #include <jansson.h>
 
diff --git a/lib/wsfs/adapter/operations.h b/lib/wsfs/adapter/operations.h
index afddbfc..ae82ce7 100644
--- a/lib/wsfs/adapter/operations.h
+++ b/lib/wsfs/adapter/operations.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_OPERATIONS
-#define WSFS_OPERATIONS
+#ifndef WSFS_ADAPTER_OPERATIONS
+#define WSFS_ADAPTER_OPERATIONS
 
 #include "wsfs/adapter/fuse_wrapper.h"
 
diff --git a/lib/wsfs/adapter/server_protocol_intern.h b/lib/wsfs/adapter/server_protocol_intern.h
index 4551062..ecdb0e9 100644
--- a/lib/wsfs/adapter/server_protocol_intern.h
+++ b/lib/wsfs/adapter/server_protocol_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_SERVER_PROTOCOL_INTERN_H
-#define WSFS_SERVER_PROTOCOL_INTERN_H
+#ifndef WSFS_ADAPTER_SERVER_PROTOCOL_INTERN_H
+#define WSFS_ADAPTER_SERVER_PROTOCOL_INTERN_H
 
 #include "wsfs/message_queue.h"
 
diff --git a/lib/wsfs/adapter/status.h b/lib/wsfs/adapter/status.h
index 89164c4..219a935 100644
--- a/lib/wsfs/adapter/status.h
+++ b/lib/wsfs/adapter/status.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_STATUS_H
-#define WSFS_STATUS_H
+#ifndef WSFS_ADAPTER_STATUS_H
+#define WSFS_ADAPTER_STATUS_H
 
 #define WSFS_GOOD 0
 #define WSFS_BAD  1
diff --git a/lib/wsfs/adapter/time/timeout_manager.h b/lib/wsfs/adapter/time/timeout_manager.h
index db6bf95..ce7d875 100644
--- a/lib/wsfs/adapter/time/timeout_manager.h
+++ b/lib/wsfs/adapter/time/timeout_manager.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_TIME_TIMEOUT_MANAGER_H
-#define WSFS_TIME_TIMEOUT_MANAGER_H
+#ifndef WSFS_ADAPTER_TIME_TIMEOUT_MANAGER_H
+#define WSFS_ADAPTER_TIME_TIMEOUT_MANAGER_H
 
 struct wsfs_timer;
 struct wsfs_timeout_manager
diff --git a/lib/wsfs/adapter/time/timeout_manager_intern.h b/lib/wsfs/adapter/time/timeout_manager_intern.h
index e9bcaec..962954e 100644
--- a/lib/wsfs/adapter/time/timeout_manager_intern.h
+++ b/lib/wsfs/adapter/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_ADAPTER_TIME_TIMEOUT_MANAGER_INTERN_H
+#define WSFS_ADAPTER_TIME_TIMEOUT_MANAGER_INTERN_H
 
 #include "wsfs/adapter/time/timeout_manager.h"
 
diff --git a/lib/wsfs/adapter/time/timepoint.h b/lib/wsfs/adapter/time/timepoint.h
index 1912c3a..44b1418 100644
--- a/lib/wsfs/adapter/time/timepoint.h
+++ b/lib/wsfs/adapter/time/timepoint.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_TIME_TIMEPOINT_H
-#define WSFS_TIME_TIMEPOINT_H
+#ifndef WSFS_ADAPTER_TIME_TIMEPOINT_H
+#define WSFS_ADAPTER_TIME_TIMEPOINT_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/adapter/time/timer.h b/lib/wsfs/adapter/time/timer.h
index 76446ac..1d215fc 100644
--- a/lib/wsfs/adapter/time/timer.h
+++ b/lib/wsfs/adapter/time/timer.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_TIMER_H
-#define WSFS_TIMER_H
+#ifndef WSFS_ADAPTER_TIME_TIMER_H
+#define WSFS_ADAPTER_TIME_TIMER_H
 
 #include "wsfs/adapter/time/timepoint.h"
 
diff --git a/lib/wsfs/adapter/time/timer_intern.h b/lib/wsfs/adapter/time/timer_intern.h
index 454f745..572e53e 100644
--- a/lib/wsfs/adapter/time/timer_intern.h
+++ b/lib/wsfs/adapter/time/timer_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFS_TIME_TIMER_INTERN_H
-#define WSFS_TIME_TIMER_INTERN_H
+#ifndef WSFS_ADAPTER_TIME_TIMER_INTERN_H
+#define WSFS_ADAPTER_TIME_TIMER_INTERN_H
 
 #ifndef __cplusplus
 #include <stdbool.h>
diff --git a/lib/wsfs/provider/client_protocol_intern.h b/lib/wsfs/provider/client_protocol_intern.h
index ac05e3c..20724b1 100644
--- a/lib/wsfs/provider/client_protocol_intern.h
+++ b/lib/wsfs/provider/client_protocol_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_CLIENT_PROTOCOL_INTERN_H
-#define WSFSP_CLIENT_PROTOCOL_INTERN_H
+#ifndef WSFS_PROVIDER_CLIENT_PROTOCOL_INTERN_H
+#define WSFS_PROVIDER_CLIENT_PROTOCOL_INTERN_H
 
 #include "wsfs/provider/client_protocol.h"
 #include "wsfs/provider/provider.h"
diff --git a/lib/wsfs/provider/operation/close_intern.h b/lib/wsfs/provider/operation/close_intern.h
index 53b1d7a..abb7968 100644
--- a/lib/wsfs/provider/operation/close_intern.h
+++ b/lib/wsfs/provider/operation/close_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_CLOSE_INTERN_H
-#define WSFSP_OPERATION_CLOSE_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_CLOSE_INTERN_H
+#define WSFS_PROVIDER_OPERATION_CLOSE_INTERN_H
 
 #include "wsfs/provider/operation/close.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/operation/getattr_intern.h b/lib/wsfs/provider/operation/getattr_intern.h
index 3d0e744..784e013 100644
--- a/lib/wsfs/provider/operation/getattr_intern.h
+++ b/lib/wsfs/provider/operation/getattr_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_GETATTR_INTERN_H
-#define WSFSP_OPERATION_GETATTR_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_GETATTR_INTERN_H
+#define WSFS_PROVIDER_OPERATION_GETATTR_INTERN_H
 
 #include "wsfs/provider/operation/getattr.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/operation/lookup_intern.h b/lib/wsfs/provider/operation/lookup_intern.h
index 65daf85..061610b 100644
--- a/lib/wsfs/provider/operation/lookup_intern.h
+++ b/lib/wsfs/provider/operation/lookup_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_LOOKUP_INTERN_H
-#define WSFSP_OPERATION_LOOKUP_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_LOOKUP_INTERN_H
+#define WSFS_PROVIDER_OPERATION_LOOKUP_INTERN_H
 
 #include "wsfs/provider/operation/lookup.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/operation/open_intern.h b/lib/wsfs/provider/operation/open_intern.h
index 496c9e1..bd03d3f 100644
--- a/lib/wsfs/provider/operation/open_intern.h
+++ b/lib/wsfs/provider/operation/open_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_OPEN_INTERN_H
-#define WSFSP_OPERATION_OPEN_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_OPEN_INTERN_H
+#define WSFS_PROVIDER_OPERATION_OPEN_INTERN_H
 
 #include "wsfs/provider/operation/open.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/operation/read_intern.h b/lib/wsfs/provider/operation/read_intern.h
index 78d040e..d8adcab 100644
--- a/lib/wsfs/provider/operation/read_intern.h
+++ b/lib/wsfs/provider/operation/read_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_READ_INTERN_H
-#define WSFSP_OPERATION_READ_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_READ_INTERN_H
+#define WSFS_PROVIDER_OPERATION_READ_INTERN_H
 
 #include "wsfs/provider/operation/read.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/operation/readdir_intern.h b/lib/wsfs/provider/operation/readdir_intern.h
index 02b5cc3..8266aa9 100644
--- a/lib/wsfs/provider/operation/readdir_intern.h
+++ b/lib/wsfs/provider/operation/readdir_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_OPERATION_READDIR_INTERN_H
-#define WSFSP_OPERATION_READDIR_INTERN_H
+#ifndef WSFS_PROVIDER_OPERATION_READDIR_INTERN_H
+#define WSFS_PROVIDER_OPERATION_READDIR_INTERN_H
 
 #include "wsfs/provider/operation/readdir.h"
 #include "wsfs/provider/provider_intern.h"
diff --git a/lib/wsfs/provider/provider_intern.h b/lib/wsfs/provider/provider_intern.h
index 9fd9709..11c5ef0 100644
--- a/lib/wsfs/provider/provider_intern.h
+++ b/lib/wsfs/provider/provider_intern.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_PROVIDER_INTERN_H
-#define WSFSP_PROVIDER_INTERN_H
+#ifndef WSFS_PROVIDER_PROVIDER_INTERN_H
+#define WSFS_PROVIDER_PROVIDER_INTERN_H
 
 #include "wsfs/provider/provider.h"
 #include "wsfs/provider/request.h"
diff --git a/lib/wsfs/provider/request.h b/lib/wsfs/provider/request.h
index 85e1cd3..d094a3a 100644
--- a/lib/wsfs/provider/request.h
+++ b/lib/wsfs/provider/request.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_REQUEST_H
-#define WSFSP_REQUEST_H
+#ifndef WSFS_PROVIDER_REQUEST_H
+#define WSFS_PROVIDER_REQUEST_H
 
 #include <jansson.h>
 #include "wsfs/provider/provider.h"
diff --git a/lib/wsfs/provider/url.h b/lib/wsfs/provider/url.h
index 2291489..896b537 100644
--- a/lib/wsfs/provider/url.h
+++ b/lib/wsfs/provider/url.h
@@ -1,5 +1,5 @@
-#ifndef WSFSP_URL_H
-#define WSFSP_URL_H
+#ifndef WSFS_PROVIDER_URL_H
+#define WSFS_PROVIDER_URL_H
 
 #ifndef __cplusplus
 #include <stdbool.h>