refactor: merged code structure

2026-03-02 04:09:18 +00:00 · 2020-06-16 23:39:45 +02:00
parent d041936abf
commit 2f80ebffcc
169 changed files with 384 additions and 418 deletions
--- a/lib/webfuse_provider/api.c
+++ b/lib/webfuse_provider/api.c
@@ -1,19 +1,19 @@
-#include "webfuse_provider.h"
+#include "webfuse_provider/webfuse_provider.h"

-#include "webfuse/provider/impl/request.h"
-#include "webfuse/provider/impl/operation/getattr.h"
-#include "webfuse/provider/impl/operation/lookup.h"
-#include "webfuse/provider/impl/operation/readdir.h"
-#include "webfuse/provider/impl/operation/open.h"
-#include "webfuse/provider/impl/operation/close.h"
-#include "webfuse/provider/impl/operation/read.h"
-#include "webfuse/provider/impl/client_protocol.h"
-#include "webfuse/provider/impl/client_config.h"
-#include "webfuse/provider/impl/client.h"
-#include "webfuse/provider/impl/dirbuffer.h"
-#include "webfuse/provider/impl/credentials.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/operation/getattr.h"
+#include "webfuse_provider/impl/operation/lookup.h"
+#include "webfuse_provider/impl/operation/readdir.h"
+#include "webfuse_provider/impl/operation/open.h"
+#include "webfuse_provider/impl/operation/close.h"
+#include "webfuse_provider/impl/operation/read.h"
+#include "webfuse_provider/impl/client_protocol.h"
+#include "webfuse_provider/impl/client_config.h"
+#include "webfuse_provider/impl/client.h"
+#include "webfuse_provider/impl/dirbuffer.h"
+#include "webfuse_provider/impl/credentials.h"

-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/util.h"

 // respond

--- a/lib/webfuse_provider/impl/base64.c
+++ b/lib/webfuse_provider/impl/base64.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/base64.h"
+#include "webfuse_provider/impl/base64.h"

 static const uint8_t wf_base64_decode_table[256] = {
    // 0     1     2     3     4     5     6     7     8      9    A     B     C     D     E     F  
--- a/lib/webfuse_provider/impl/base64.h
+++ b/lib/webfuse_provider/impl/base64.h
--- a/lib/webfuse_provider/impl/client.c
+++ b/lib/webfuse_provider/impl/client.c
@@ -1,4 +1,4 @@
-#include "webfuse/provider/impl/client.h"
+#include "webfuse_provider/impl/client.h"

 #include <stdlib.h>
 #include <string.h>
@@ -6,10 +6,10 @@

 #include <libwebsockets.h>

-#include "webfuse/provider/impl/provider.h"
-#include "webfuse/provider/impl/client_protocol.h"
-#include "webfuse/provider/impl/client_config.h"
-#include "webfuse/core/lws_log.h"
+#include "webfuse_provider/impl/provider.h"
+#include "webfuse_provider/impl/client_protocol.h"
+#include "webfuse_provider/impl/client_config.h"
+#include "webfuse_provider/impl/lws_log.h"

 #define WFP_CLIENT_PROTOCOL_COUNT 2

--- a/lib/webfuse_provider/impl/client.h
+++ b/lib/webfuse_provider/impl/client.h
--- a/lib/webfuse_provider/impl/client_config.c
+++ b/lib/webfuse_provider/impl/client_config.c
@@ -1,5 +1,5 @@
-#include "webfuse/provider/impl/client_config.h"
-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/client_config.h"
+#include "webfuse_provider/impl/provider.h"
 #include <stdlib.h>
 #include <string.h>

--- a/lib/webfuse_provider/impl/client_config.h
+++ b/lib/webfuse_provider/impl/client_config.h
@@ -1,8 +1,8 @@
 #ifndef WF_PROVIDER_IMPL_CLIENT_CONFIG_H
 #define WF_PROVIDER_IMPL_CLIENT_CONFIG_H

-#include "webfuse/provider/client_config.h"
-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/client_config.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/client_protocol.c
+++ b/lib/webfuse_provider/impl/client_protocol.c
@@ -1,4 +1,4 @@
-#include "webfuse/provider/impl/client_protocol.h"
+#include "webfuse_provider/impl/client_protocol.h"

 #include <stdlib.h>
 #include <string.h>
@@ -6,21 +6,21 @@
 #include <libwebsockets.h>
 #include <jansson.h>

-#include "webfuse/provider/impl/client_config.h"
-#include "webfuse/provider/impl/provider.h"
-#include "webfuse/provider/impl/credentials.h"
-#include "webfuse/core/util.h"
-#include "webfuse/core/message.h"
-#include "webfuse/core/message_queue.h"
-#include "webfuse/core/container_of.h"
-#include "webfuse/core/url.h"
-#include "webfuse/core/protocol_names.h"
+#include "webfuse_provider/impl/client_config.h"
+#include "webfuse_provider/impl/provider.h"
+#include "webfuse_provider/impl/credentials.h"
+#include "webfuse_provider/impl/util.h"
+#include "webfuse_provider/impl/message.h"
+#include "webfuse_provider/impl/message_queue.h"
+#include "webfuse_provider/impl/container_of.h"
+#include "webfuse_provider/impl/url.h"
+#include "webfuse_provider/protocol_names.h"

-#include "webfuse/core/timer/manager.h"
+#include "webfuse_provider/impl/timer/manager.h"

-#include "webfuse/core/jsonrpc/response.h"
-#include "webfuse/core/jsonrpc/request.h"
-#include "webfuse/core/jsonrpc/proxy.h"
+#include "webfuse_provider/impl/jsonrpc/response.h"
+#include "webfuse_provider/impl/jsonrpc/request.h"
+#include "webfuse_provider/impl/jsonrpc/proxy.h"

 #define WF_DEFAULT_TIMEOUT (10 * 1000)

--- a/lib/webfuse_provider/impl/client_protocol.h
+++ b/lib/webfuse_provider/impl/client_protocol.h
@@ -1,10 +1,10 @@
 #ifndef WF_PROVIDER_IMPL_CLIENT_PROTOCOL_H
 #define WF_PROVIDER_IMPL_CLIENT_PROTOCOL_H

-#include "webfuse/provider/impl/provider.h"
-#include "webfuse/provider/impl/request.h"
+#include "webfuse_provider/impl/provider.h"
+#include "webfuse_provider/impl/request.h"

-#include "webfuse/core/slist.h"
+#include "webfuse_provider/impl/slist.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/container_of.h
+++ b/lib/webfuse_provider/impl/container_of.h
--- a/lib/webfuse_provider/impl/credentials.c
+++ b/lib/webfuse_provider/impl/credentials.c
@@ -1,4 +1,4 @@
-#include "webfuse/provider/impl/credentials.h"
+#include "webfuse_provider/impl/credentials.h"

 #include <stdlib.h>
 #include <string.h>
--- a/lib/webfuse_provider/impl/credentials.h
+++ b/lib/webfuse_provider/impl/credentials.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_CREDENTIALS_H
 #define WF_PROVIDER_IMPL_CREDENTIALS_H

-#include "webfuse/provider/credentials.h"
+#include "webfuse_provider/credentials.h"
 #include <jansson.h>

 #ifdef __cplusplus
--- a/lib/webfuse_provider/impl/dirbuffer.c
+++ b/lib/webfuse_provider/impl/dirbuffer.c
@@ -1,4 +1,4 @@
-#include "webfuse/provider/impl/dirbuffer.h"
+#include "webfuse_provider/impl/dirbuffer.h"
 #include <stdlib.h>

 struct wfp_dirbuffer * wfp_impl_dirbuffer_create(void)
--- a/lib/webfuse_provider/impl/dirbuffer.h
+++ b/lib/webfuse_provider/impl/dirbuffer.h
--- a/lib/webfuse_provider/impl/json_util.c
+++ b/lib/webfuse_provider/impl/json_util.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/json_util.h"
+#include "webfuse_provider/impl/json_util.h"

 int wf_impl_json_get_int(json_t const * object, char const * key, int default_value)
 {
--- a/lib/webfuse_provider/impl/json_util.h
+++ b/lib/webfuse_provider/impl/json_util.h
@@ -2,7 +2,7 @@
 #define WF_JSON_UTIL_H

 #include <jansson.h>
-#include "webfuse/core/status.h"
+#include "webfuse_provider/status.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/jsonrpc/error.c
+++ b/lib/webfuse_provider/impl/jsonrpc/error.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/jsonrpc/error.h"
+#include "webfuse_provider/impl/jsonrpc/error.h"

 json_t *
 wf_jsonrpc_error(
--- a/lib/webfuse_provider/impl/jsonrpc/error.h
+++ b/lib/webfuse_provider/impl/jsonrpc/error.h
@@ -2,7 +2,7 @@
 #define WF_JSONRPC_ERROR_H

 #include <jansson.h>
-#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
+#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/jsonrpc/method.c
+++ b/lib/webfuse_provider/impl/jsonrpc/method.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/jsonrpc/method.h"
+#include "webfuse_provider/impl/jsonrpc/method.h"
 #include <stdlib.h>
 #include <string.h>

--- a/lib/webfuse_provider/impl/jsonrpc/method.h
+++ b/lib/webfuse_provider/impl/jsonrpc/method.h
@@ -1,7 +1,7 @@
 #ifndef WF_JSONRPC_METHOD_H
 #define WF_JSONRPC_METHOD_H

-#include "webfuse/core/jsonrpc/method_invoke_fn.h"
+#include "webfuse_provider/impl/jsonrpc/method_invoke_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/jsonrpc/method_invoke_fn.h
+++ b/lib/webfuse_provider/impl/jsonrpc/method_invoke_fn.h
--- a/lib/webfuse_provider/impl/jsonrpc/proxy.c
+++ b/lib/webfuse_provider/impl/jsonrpc/proxy.c
@@ -1,9 +1,9 @@
-#include "webfuse/core/jsonrpc/proxy_intern.h"
-#include "webfuse/core/jsonrpc/response_intern.h"
-#include "webfuse/core/jsonrpc/error.h"
-#include "webfuse/core/status.h"
+#include "webfuse_provider/impl/jsonrpc/proxy_intern.h"
+#include "webfuse_provider/impl/jsonrpc/response_intern.h"
+#include "webfuse_provider/impl/jsonrpc/error.h"
+#include "webfuse_provider/status.h"

-#include "webfuse/core/timer/timer.h"
+#include "webfuse_provider/impl/timer/timer.h"

 #include <stdlib.h>
 #include <string.h>
--- a/lib/webfuse_provider/impl/jsonrpc/proxy.h
+++ b/lib/webfuse_provider/impl/jsonrpc/proxy.h
@@ -12,8 +12,8 @@ using std::size_t;
 #endif

 #include <jansson.h>
-#include "webfuse/core/jsonrpc/send_fn.h"
-#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
+#include "webfuse_provider/impl/jsonrpc/send_fn.h"
+#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h"

 #ifdef __cplusplus
 extern "C" {
--- a/lib/webfuse_provider/impl/jsonrpc/proxy_finished_fn.h
+++ b/lib/webfuse_provider/impl/jsonrpc/proxy_finished_fn.h
--- a/lib/webfuse_provider/impl/jsonrpc/proxy_intern.h
+++ b/lib/webfuse_provider/impl/jsonrpc/proxy_intern.h
@@ -1,9 +1,9 @@
 #ifndef WF_JSONRPC_PROXY_INTERN_H
 #define WF_JSONRPC_PROXY_INTERN_H

-#include "webfuse/core/jsonrpc/proxy.h"
-#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
-#include "webfuse/core/jsonrpc/send_fn.h"
+#include "webfuse_provider/impl/jsonrpc/proxy.h"
+#include "webfuse_provider/impl/jsonrpc/proxy_finished_fn.h"
+#include "webfuse_provider/impl/jsonrpc/send_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c
+++ b/lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/jsonrpc/proxy_intern.h"
+#include "webfuse_provider/impl/jsonrpc/proxy_intern.h"

 void wf_jsonrpc_proxy_invoke(
 	struct wf_jsonrpc_proxy * proxy,
--- a/lib/webfuse_provider/impl/jsonrpc/request.c
+++ b/lib/webfuse_provider/impl/jsonrpc/request.c
@@ -1,5 +1,5 @@
-#include "webfuse/core/jsonrpc/request.h"
-#include "webfuse/core/jsonrpc/error.h"
+#include "webfuse_provider/impl/jsonrpc/request.h"
+#include "webfuse_provider/impl/jsonrpc/error.h"
 #include <stdlib.h>

 struct wf_jsonrpc_request
--- a/lib/webfuse_provider/impl/jsonrpc/request.h
+++ b/lib/webfuse_provider/impl/jsonrpc/request.h
@@ -12,7 +12,7 @@ using std::size_t;
 #endif

 #include <jansson.h>
-#include "webfuse/core/jsonrpc/send_fn.h"
+#include "webfuse_provider/impl/jsonrpc/send_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/jsonrpc/response.c
+++ b/lib/webfuse_provider/impl/jsonrpc/response.c
@@ -1,6 +1,6 @@
-#include "webfuse/core/jsonrpc/response_intern.h"
-#include "webfuse/core/jsonrpc/error.h"
-#include "webfuse/core/status.h"
+#include "webfuse_provider/impl/jsonrpc/response_intern.h"
+#include "webfuse_provider/impl/jsonrpc/error.h"
+#include "webfuse_provider/status.h"

 bool
 wf_jsonrpc_is_response(
--- a/lib/webfuse_provider/impl/jsonrpc/response.h
+++ b/lib/webfuse_provider/impl/jsonrpc/response.h
--- a/lib/webfuse_provider/impl/jsonrpc/response_intern.h
+++ b/lib/webfuse_provider/impl/jsonrpc/response_intern.h
@@ -1,7 +1,7 @@
 #ifndef WF_JSONRPC_RESPONSE_INTERN_H
 #define WF_JSONRPC_RESPONSE_INTERN_H

-#include "webfuse/core/jsonrpc/response.h"
+#include "webfuse_provider/impl/jsonrpc/response.h"

 #ifndef __cplusplus
 #include <stddef.h>
--- a/lib/webfuse_provider/impl/jsonrpc/send_fn.h
+++ b/lib/webfuse_provider/impl/jsonrpc/send_fn.h
--- a/lib/webfuse_provider/impl/jsonrpc/server.c
+++ b/lib/webfuse_provider/impl/jsonrpc/server.c
@@ -1,8 +1,8 @@
-#include "webfuse/core/jsonrpc/server.h"
-#include "webfuse/core/jsonrpc/method.h"
-#include "webfuse/core/jsonrpc/request.h"
-#include "webfuse/core/status.h"
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/jsonrpc/server.h"
+#include "webfuse_provider/impl/jsonrpc/method.h"
+#include "webfuse_provider/impl/jsonrpc/request.h"
+#include "webfuse_provider/status.h"
+#include "webfuse_provider/impl/util.h"

 #include <stdlib.h>
 #include <string.h>
--- a/lib/webfuse_provider/impl/jsonrpc/server.h
+++ b/lib/webfuse_provider/impl/jsonrpc/server.h
@@ -9,8 +9,8 @@
 #endif

 #include <jansson.h>
-#include "webfuse/core/jsonrpc/method_invoke_fn.h"
-#include "webfuse/core/jsonrpc/send_fn.h"
+#include "webfuse_provider/impl/jsonrpc/method_invoke_fn.h"
+#include "webfuse_provider/impl/jsonrpc/send_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/lws_log.c
+++ b/lib/webfuse_provider/impl/lws_log.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/lws_log.h"
+#include "webfuse_provider/impl/lws_log.h"
 #include <stdbool.h>
 #include <libwebsockets.h>

--- a/lib/webfuse_provider/impl/lws_log.h
+++ b/lib/webfuse_provider/impl/lws_log.h
--- a/lib/webfuse_provider/impl/message.c
+++ b/lib/webfuse_provider/impl/message.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/message.h"
+#include "webfuse_provider/impl/message.h"

 #include <stdlib.h>
 #include <libwebsockets.h>
--- a/lib/webfuse_provider/impl/message.h
+++ b/lib/webfuse_provider/impl/message.h
@@ -9,7 +9,7 @@ using std::size_t;
 #endif

 #include <jansson.h>
-#include "webfuse/core/slist.h"
+#include "webfuse_provider/impl/slist.h"

 struct wf_message
 {
--- a/lib/webfuse_provider/impl/message_queue.c
+++ b/lib/webfuse_provider/impl/message_queue.c
@@ -1,6 +1,6 @@
-#include "webfuse/core/message_queue.h"
-#include "webfuse/core/message.h"
-#include "webfuse/core/container_of.h"
+#include "webfuse_provider/impl/message_queue.h"
+#include "webfuse_provider/impl/message.h"
+#include "webfuse_provider/impl/container_of.h"

 void wf_message_queue_cleanup(
    struct wf_slist * queue)
--- a/lib/webfuse_provider/impl/message_queue.h
+++ b/lib/webfuse_provider/impl/message_queue.h
--- a/lib/webfuse_provider/impl/operation/close.c
+++ b/lib/webfuse_provider/impl/operation/close.c
@@ -1,6 +1,6 @@
-#include "webfuse/provider/impl/operation/close.h"
+#include "webfuse_provider/impl/operation/close.h"
 #include <limits.h>
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/util.h"

 void wfp_impl_close(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/operation/close.h
+++ b/lib/webfuse_provider/impl/operation/close.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_CLOSE_H
 #define WF_PROVIDER_IMPL_OPERATION_CLOSE_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/error.h
+++ b/lib/webfuse_provider/impl/operation/error.h
@@ -1,8 +1,8 @@
 #ifndef WFP_OPERATION_IMPL_ERROR_H
 #define WFP_OPERATION_IMPL_ERROR_H

-#include "webfuse/provider/api.h"
-#include "webfuse/core/status.h"
+#include "webfuse_provider/api.h"
+#include "webfuse_provider/status.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/getattr.c
+++ b/lib/webfuse_provider/impl/operation/getattr.c
@@ -1,10 +1,10 @@
-#include "webfuse/provider/impl/operation/getattr.h"
+#include "webfuse_provider/impl/operation/getattr.h"

 #include <stdbool.h>

-#include "webfuse/provider/impl/operation/error.h"
-#include "webfuse/provider/impl/request.h"
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/operation/error.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/util.h"


 void wfp_impl_getattr(
--- a/lib/webfuse_provider/impl/operation/getattr.h
+++ b/lib/webfuse_provider/impl/operation/getattr.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_GETATTR_H
 #define WF_PROVIDER_IMPL_OPERATION_GETATTR_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/lookup.c
+++ b/lib/webfuse_provider/impl/operation/lookup.c
@@ -1,10 +1,10 @@
-#include "webfuse/provider/impl/operation/lookup.h"
+#include "webfuse_provider/impl/operation/lookup.h"

 #include <stdbool.h>

-#include "webfuse/provider/impl/operation/error.h"
-#include "webfuse/provider/impl/request.h"
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/operation/error.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/util.h"

 void wfp_impl_lookup(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/operation/lookup.h
+++ b/lib/webfuse_provider/impl/operation/lookup.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_LOOKUP_H
 #define WF_PROVIDER_IMPL_OPERATION_LOOKUP_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/open.c
+++ b/lib/webfuse_provider/impl/operation/open.c
@@ -1,7 +1,7 @@
-#include "webfuse/provider/impl/operation/open.h"
-#include "webfuse/provider/impl/operation/error.h"
-#include "webfuse/provider/impl/request.h"
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/operation/open.h"
+#include "webfuse_provider/impl/operation/error.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/util.h"

 void wfp_impl_open(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/operation/open.h
+++ b/lib/webfuse_provider/impl/operation/open.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_OPEN_H
 #define WF_PROVIDER_IMPL_OPERATION_OPEN_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/read.c
+++ b/lib/webfuse_provider/impl/operation/read.c
@@ -1,11 +1,11 @@
-#include "webfuse/provider/impl/operation/read.h"
+#include "webfuse_provider/impl/operation/read.h"

 #include <stdlib.h>

-#include "webfuse/provider/impl/operation/error.h"
-#include "webfuse/provider/impl/request.h"
-#include "webfuse/core/util.h"
-#include "webfuse/core/base64.h"
+#include "webfuse_provider/impl/operation/error.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/util.h"
+#include "webfuse_provider/impl/base64.h"

 void wfp_impl_read(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/operation/read.h
+++ b/lib/webfuse_provider/impl/operation/read.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_READ_H
 #define WF_PROVIDER_IMPL_OPERATION_READ_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/operation/readdir.c
+++ b/lib/webfuse_provider/impl/operation/readdir.c
@@ -1,8 +1,8 @@
-#include "webfuse/provider/impl/operation/readdir.h"
-#include "webfuse/provider/impl/operation/error.h"
-#include "webfuse/provider/impl/dirbuffer.h"
-#include "webfuse/provider/impl/request.h"
-#include "webfuse/core/util.h"
+#include "webfuse_provider/impl/operation/readdir.h"
+#include "webfuse_provider/impl/operation/error.h"
+#include "webfuse_provider/impl/dirbuffer.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/util.h"

 void wfp_impl_readdir(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/operation/readdir.h
+++ b/lib/webfuse_provider/impl/operation/readdir.h
@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_IMPL_OPERATION_READDIR_H
 #define WF_PROVIDER_IMPL_OPERATION_READDIR_H

-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/provider.c
+++ b/lib/webfuse_provider/impl/provider.c
@@ -1,15 +1,15 @@
-#include "webfuse/provider/impl/provider.h"
+#include "webfuse_provider/impl/provider.h"

 #include <stdbool.h>
 #include <string.h>

-#include "webfuse/provider/impl/request.h"
-#include "webfuse/provider/impl/operation/lookup.h"
-#include "webfuse/provider/impl/operation/getattr.h"
-#include "webfuse/provider/impl/operation/readdir.h"
-#include "webfuse/provider/impl/operation/open.h"
-#include "webfuse/provider/impl/operation/close.h"
-#include "webfuse/provider/impl/operation/read.h"
+#include "webfuse_provider/impl/request.h"
+#include "webfuse_provider/impl/operation/lookup.h"
+#include "webfuse_provider/impl/operation/getattr.h"
+#include "webfuse_provider/impl/operation/readdir.h"
+#include "webfuse_provider/impl/operation/open.h"
+#include "webfuse_provider/impl/operation/close.h"
+#include "webfuse_provider/impl/operation/read.h"

 typedef void wfp_impl_invoke_fn(
    struct wfp_impl_invokation_context * context,
--- a/lib/webfuse_provider/impl/provider.h
+++ b/lib/webfuse_provider/impl/provider.h
@@ -6,7 +6,7 @@
 #endif

 #include <jansson.h>
-#include "webfuse/provider/client_config.h"
+#include "webfuse_provider/client_config.h"


 #ifdef __cplusplus
--- a/lib/webfuse_provider/impl/request.c
+++ b/lib/webfuse_provider/impl/request.c
@@ -1,7 +1,7 @@
-#include "webfuse/provider/impl/request.h"
+#include "webfuse_provider/impl/request.h"

 #include <stdlib.h>
-#include "webfuse/provider/impl/operation/error.h"
+#include "webfuse_provider/impl/operation/error.h"

 struct wfp_request * wfp_impl_request_create(
    struct wfp_request * prototype,
--- a/lib/webfuse_provider/impl/request.h
+++ b/lib/webfuse_provider/impl/request.h
@@ -2,8 +2,8 @@
 #define WF_PROVIDER_IMPL_REQUEST_H

 #include <jansson.h>
-#include "webfuse/provider/impl/provider.h"
-#include "webfuse/core/status.h"
+#include "webfuse_provider/impl/provider.h"
+#include "webfuse_provider/status.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/slist.c
+++ b/lib/webfuse_provider/impl/slist.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/slist.h"
+#include "webfuse_provider/impl/slist.h"
 #include <stddef.h>

 void wf_slist_init(
--- a/lib/webfuse_provider/impl/slist.h
+++ b/lib/webfuse_provider/impl/slist.h
--- a/lib/webfuse_provider/impl/status.c
+++ b/lib/webfuse_provider/impl/status.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/status_intern.h"
+#include "webfuse_provider/impl/status_intern.h"

 #include <errno.h>

--- a/lib/webfuse_provider/impl/status_intern.h
+++ b/lib/webfuse_provider/impl/status_intern.h
@@ -1,7 +1,7 @@
 #ifndef WF_STATUS_INTERN_H
 #define WF_STATUS_INTERN_H

-#include "webfuse/core/status.h"
+#include "webfuse_provider/status.h"

 #ifdef __cplusplus
 extern "C" {
--- a/lib/webfuse_provider/impl/timer/manager.c
+++ b/lib/webfuse_provider/impl/timer/manager.c
@@ -1,6 +1,6 @@
-#include "webfuse/core/timer/manager_intern.h"
-#include "webfuse/core/timer/timer_intern.h"
-#include "webfuse/core/timer/timepoint.h"
+#include "webfuse_provider/impl/timer/manager_intern.h"
+#include "webfuse_provider/impl/timer/timer_intern.h"
+#include "webfuse_provider/impl/timer/timepoint.h"

 #include <stddef.h>
 #include <stdlib.h>
--- a/lib/webfuse_provider/impl/timer/manager.h
+++ b/lib/webfuse_provider/impl/timer/manager.h
--- a/lib/webfuse_provider/impl/timer/manager_intern.h
+++ b/lib/webfuse_provider/impl/timer/manager_intern.h
@@ -1,7 +1,7 @@
 #ifndef WF_TIMER_MANAGER_INTERN_H
 #define WF_TIMER_MANAGER_INTERN_H

-#include "webfuse/core/timer/manager.h"
+#include "webfuse_provider/impl/timer/manager.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/timer/on_timer_fn.h
+++ b/lib/webfuse_provider/impl/timer/on_timer_fn.h
--- a/lib/webfuse_provider/impl/timer/timepoint.c
+++ b/lib/webfuse_provider/impl/timer/timepoint.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/timer/timepoint.h"
+#include "webfuse_provider/impl/timer/timepoint.h"

 #include <time.h>

--- a/lib/webfuse_provider/impl/timer/timepoint.h
+++ b/lib/webfuse_provider/impl/timer/timepoint.h
--- a/lib/webfuse_provider/impl/timer/timer.c
+++ b/lib/webfuse_provider/impl/timer/timer.c
@@ -1,6 +1,6 @@
-#include "webfuse/core/timer/timer_intern.h"
-#include "webfuse/core/timer/manager_intern.h"
-#include "webfuse/core/timer/timepoint.h"
+#include "webfuse_provider/impl/timer/timer_intern.h"
+#include "webfuse_provider/impl/timer/manager_intern.h"
+#include "webfuse_provider/impl/timer/timepoint.h"

 #include <stddef.h>
 #include <stdlib.h>
--- a/lib/webfuse_provider/impl/timer/timer.h
+++ b/lib/webfuse_provider/impl/timer/timer.h
@@ -1,7 +1,7 @@
 #ifndef WF_TIMER_TIMER_H
 #define WF_TIMER_TIMER_H

-#include "webfuse/core/timer/on_timer_fn.h"
+#include "webfuse_provider/impl/timer/on_timer_fn.h"

 #ifdef __cplusplus
 extern "C"
--- a/lib/webfuse_provider/impl/timer/timer_intern.h
+++ b/lib/webfuse_provider/impl/timer/timer_intern.h
@@ -1,9 +1,9 @@
 #ifndef WF_TIMER_TIMER_H
 #define WF_TIMER_TIMER_H

-#include "webfuse/core/timer/timer.h"
-#include "webfuse/core/timer/on_timer_fn.h"
-#include "webfuse/core/timer/timepoint.h"
+#include "webfuse_provider/impl/timer/timer.h"
+#include "webfuse_provider/impl/timer/on_timer_fn.h"
+#include "webfuse_provider/impl/timer/timepoint.h"

 #ifndef __cplusplus
 #include <stdbool.h>
--- a/lib/webfuse_provider/impl/url.c
+++ b/lib/webfuse_provider/impl/url.c
@@ -1,4 +1,4 @@
-#include "webfuse/core/url.h"
+#include "webfuse_provider/impl/url.h"

 #include <stdlib.h>
 #include <string.h>
--- a/lib/webfuse_provider/impl/url.h
+++ b/lib/webfuse_provider/impl/url.h
--- a/lib/webfuse_provider/impl/util.h
+++ b/lib/webfuse_provider/impl/util.h