refactor: merged code structure

examples/meson.build

@@ -1,15 +0,0 @@
-project('webfuse-provider', version: '0.1.0', license: 'LGPL-3.0+')
-
-
-webfuse_provider_dep = dependency('webfuse_provider', version: '>=0.3.0',
-    fallback: ['webfuse', 'webfuse_provider_dep'], default_options: ['without_adapter=true'])
-
-executable('webfuse-provider',
-    'src/main.c',
-    dependencies: [webfuse_provider_dep])
-
-executable('static-filesystem-provider',
-	'src/static_filesystem/static_filesystem.c',
-	'src/static_filesystem/path.c',
-	'src/static_filesystem/main.c',
-    dependencies: [webfuse_provider_dep])

examples/provider/main.c

@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include "webfuse_provider.h"
+#include "webfuse_provider/webfuse_provider.h"
 
 struct config
 {

examples/static_filesystem/main.c

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <signal.h>
 
-#include "webfuse_provider.h"
+#include "webfuse_provider/webfuse_provider.h"
 #include "static_filesystem.h"
 
 struct args

examples/static_filesystem/static_filesystem.c

@@ -1,8 +1,8 @@
 #include "static_filesystem.h"
 
-#include "webfuse/provider/client_config.h"
-#include "webfuse/provider/dirbuffer.h"
-#include "webfuse/provider/operation/error.h"
+#include "webfuse_provider/client_config.h"
+#include "webfuse_provider/dirbuffer.h"
+#include "webfuse_provider/operation/error.h"
 
 #include "path.h"
 

include/webfuse_provider.h

@@ -1,27 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-/// \file webfuse_provider.h
-/// \brief Convenience header to include all functionality of libfuse_provider.
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef WF_PROVIDER_H
-#define WF_PROVIDER_H
-
-#include <webfuse/core/status.h>
-#include <webfuse/core/protocol_names.h>
-
-#include <webfuse/provider/api.h>
-#include <webfuse/provider/client.h>
-#include <webfuse/provider/client_config.h>
-#include <webfuse/provider/client_protocol.h>
-#include <webfuse/provider/dirbuffer.h>
-#include <webfuse/provider/credentials.h>
-
-#include <webfuse/provider/operation/error.h>
-#include <webfuse/provider/operation/lookup.h>
-#include <webfuse/provider/operation/getattr.h>
-#include <webfuse/provider/operation/readdir.h>
-#include <webfuse/provider/operation/open.h>
-#include <webfuse/provider/operation/close.h>
-#include <webfuse/provider/operation/read.h>
-
-#endif

include/webfuse_provider/client.h

@@ -6,7 +6,7 @@
 #ifndef WF_PROVIDER_CLIENT_H
 #define WF_PROVIDER_CLIENT_H
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/client_config.h

@@ -6,15 +6,15 @@
 #ifndef WF_PROVIDER_CLIENT_CONFIG_H
 #define WF_PROVIDER_CLIENT_CONFIG_H
 
-#include <webfuse/provider/api.h>
-
-#include <webfuse/provider/operation/lookup.h>
-#include <webfuse/provider/operation/getattr.h>
-#include <webfuse/provider/operation/readdir.h>
-#include <webfuse/provider/operation/open.h>
-#include <webfuse/provider/operation/close.h>
-#include <webfuse/provider/operation/read.h>
-#include <webfuse/provider/credentials.h>
+#include <webfuse_provider/api.h>
+
+#include <webfuse_provider/operation/lookup.h>
+#include <webfuse_provider/operation/getattr.h>
+#include <webfuse_provider/operation/readdir.h>
+#include <webfuse_provider/operation/open.h>
+#include <webfuse_provider/operation/close.h>
+#include <webfuse_provider/operation/read.h>
+#include <webfuse_provider/credentials.h>
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/client_protocol.h

@@ -11,7 +11,7 @@
 #ifndef WF_PROVIDER_CLIENT_PROTOCOL_H
 #define WF_PROVIDER_CLIENT_PROTOCOL_H
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/credentials.h

@@ -1,7 +1,7 @@
 #ifndef WF_PROVIDER_CREDENTIALS_H
 #define WF_PROVIDER_CREDENTIALS_H
 
-#include <webfuse/provider/api.h>
+#include <webfuse_provider/api.h>
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/dirbuffer.h

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/close.h

@@ -16,7 +16,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/error.h

@@ -6,8 +6,8 @@
 #ifndef WFP_OPERATION_ERROR_H
 #define WFP_OPERATION_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"

include/webfuse_provider/operation/getattr.h

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/lookup.h

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/open.h

@@ -16,7 +16,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/read.h

@@ -19,7 +19,7 @@ using std::size_t;
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/operation/readdir.h

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "webfuse/provider/api.h"
+#include "webfuse_provider/api.h"
 
 #ifdef __cplusplus
 extern "C"

include/webfuse_provider/webfuse_provider.h

@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+/// \file webfuse_provider.h
+/// \brief Convenience header to include all functionality of libfuse_provider.
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef WF_PROVIDER_H
+#define WF_PROVIDER_H
+
+#include <webfuse_provider/status.h>
+#include <webfuse_provider/protocol_names.h>
+
+#include <webfuse_provider/api.h>
+#include <webfuse_provider/client.h>
+#include <webfuse_provider/client_config.h>
+#include <webfuse_provider/client_protocol.h>
+#include <webfuse_provider/dirbuffer.h>
+#include <webfuse_provider/credentials.h>
+
+#include <webfuse_provider/operation/error.h>
+#include <webfuse_provider/operation/lookup.h>
+#include <webfuse_provider/operation/getattr.h>
+#include <webfuse_provider/operation/readdir.h>
+#include <webfuse_provider/operation/open.h>
+#include <webfuse_provider/operation/close.h>
+#include <webfuse_provider/operation/read.h>
+
+#endif

lib/webfuse_provider/api.c

@@ -1,19 +1,19 @@
-#include "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/core/util.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/util.h"
 
 // respond
 

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  

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
 

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>
 

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"

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/core/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/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_provider/impl/timer/manager.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)
 

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"

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>

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

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)

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)
 {

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"

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(

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"

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>
 

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"

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>

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" {

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"

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,

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

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"

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(

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>

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>

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"

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>
 

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>

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
 {

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)

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,

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"

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"

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(

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"

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,

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"

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,

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"

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,

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"

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,

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"

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,

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

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,

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"

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(

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>
 

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" {

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>

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"

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>
 

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>

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"

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>

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>

meson.build

@@ -14,82 +14,64 @@ jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'ja
 
 pkg_config = import('pkgconfig')
 
-# Webfuse core
-
-inc_dir = include_directories('include')
-private_inc_dir = include_directories('include', 'lib')
-
-webfuse_core = static_library('webfuse_core',
-    'lib/webfuse/core/slist.c',
-	'lib/webfuse/core/message.c',
-	'lib/webfuse/core/message_queue.c',
-	'lib/webfuse/core/status.c',
-	'lib/webfuse/core/base64.c',
-	'lib/webfuse/core/lws_log.c',
-	'lib/webfuse/core/json_util.c',
-	'lib/webfuse/core/url.c',
-    'lib/webfuse/core/timer/manager.c',
-    'lib/webfuse/core/timer/timepoint.c',
-    'lib/webfuse/core/timer/timer.c',
-	'lib/webfuse/core/jsonrpc/proxy.c',
-	'lib/webfuse/core/jsonrpc/proxy_variadic.c',
-	'lib/webfuse/core/jsonrpc/server.c',
-	'lib/webfuse/core/jsonrpc/method.c',
-	'lib/webfuse/core/jsonrpc/request.c',
-	'lib/webfuse/core/jsonrpc/response.c',
-	'lib/webfuse/core/jsonrpc/error.c',
-    c_args: ['-fvisibility=hidden'],
-    include_directories: private_inc_dir,    
-    dependencies: [jansson_dep, libwebsockets_dep])
-
-webfuse_core_dep = declare_dependency(
-    include_directories: inc_dir,
-    link_with: webfuse_core,
-	dependencies: [jansson_dep, libwebsockets_dep])
-
-install_subdir('include/webfuse/core', install_dir: 'include/webfuse')
-
 # Webfuse provider
 
 webfuse_provider_static = static_library('webfuse_provider',
-	'lib/webfuse/provider/api.c',
-	'lib/webfuse/provider/impl/client.c',
-	'lib/webfuse/provider/impl/client_config.c',
-	'lib/webfuse/provider/impl/client_protocol.c',
-	'lib/webfuse/provider/impl/provider.c',
-	'lib/webfuse/provider/impl/request.c',
-	'lib/webfuse/provider/impl/dirbuffer.c',
-	'lib/webfuse/provider/impl/credentials.c',
-	'lib/webfuse/provider/impl/operation/lookup.c',
-	'lib/webfuse/provider/impl/operation/getattr.c',
-	'lib/webfuse/provider/impl/operation/readdir.c',
-	'lib/webfuse/provider/impl/operation/open.c',
-	'lib/webfuse/provider/impl/operation/close.c',
-	'lib/webfuse/provider/impl/operation/read.c',
+    'lib/webfuse_provider/impl/slist.c',
+	'lib/webfuse_provider/impl/message.c',
+	'lib/webfuse_provider/impl/message_queue.c',
+	'lib/webfuse_provider/impl/status.c',
+	'lib/webfuse_provider/impl/base64.c',
+	'lib/webfuse_provider/impl/lws_log.c',
+	'lib/webfuse_provider/impl/json_util.c',
+	'lib/webfuse_provider/impl/url.c',
+    'lib/webfuse_provider/impl/timer/manager.c',
+    'lib/webfuse_provider/impl/timer/timepoint.c',
+    'lib/webfuse_provider/impl/timer/timer.c',
+	'lib/webfuse_provider/impl/jsonrpc/proxy.c',
+	'lib/webfuse_provider/impl/jsonrpc/proxy_variadic.c',
+	'lib/webfuse_provider/impl/jsonrpc/server.c',
+	'lib/webfuse_provider/impl/jsonrpc/method.c',
+	'lib/webfuse_provider/impl/jsonrpc/request.c',
+	'lib/webfuse_provider/impl/jsonrpc/response.c',
+	'lib/webfuse_provider/impl/jsonrpc/error.c',
+	'lib/webfuse_provider/api.c',
+	'lib/webfuse_provider/impl/client.c',
+	'lib/webfuse_provider/impl/client_config.c',
+	'lib/webfuse_provider/impl/client_protocol.c',
+	'lib/webfuse_provider/impl/provider.c',
+	'lib/webfuse_provider/impl/request.c',
+	'lib/webfuse_provider/impl/dirbuffer.c',
+	'lib/webfuse_provider/impl/credentials.c',
+	'lib/webfuse_provider/impl/operation/lookup.c',
+	'lib/webfuse_provider/impl/operation/getattr.c',
+	'lib/webfuse_provider/impl/operation/readdir.c',
+	'lib/webfuse_provider/impl/operation/open.c',
+	'lib/webfuse_provider/impl/operation/close.c',
+	'lib/webfuse_provider/impl/operation/read.c',
     c_args: ['-fvisibility=hidden'],
-    include_directories: private_inc_dir,
-    dependencies: [webfuse_core_dep])
+    include_directories: ['include', 'lib'],
+    dependencies: [libwebsockets_dep, jansson_dep])
 
 webfuse_provider_static_dep = declare_dependency(
-    include_directories: inc_dir,
+    include_directories: ['include'],
     link_with: webfuse_provider_static,
-	dependencies: [webfuse_core_dep])
+	dependencies: [libwebsockets_dep, jansson_dep])
 
 webfuse_provider = shared_library('webfuse_provider',
-    'lib/webfuse/provider/api.c',
+    'lib/webfuse_provider/api.c',
     version: meson.project_version(),
     c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'],
-    include_directories: private_inc_dir,
-    dependencies: [webfuse_provider_static_dep],
+    include_directories: ['include', 'lib'],
+    dependencies: [webfuse_provider_static_dep, libwebsockets_dep, jansson_dep],
 	install: true)
 
 webfuse_provider_dep = declare_dependency(
-	include_directories: inc_dir,
+	include_directories: ['include'],
 	link_with: [webfuse_provider],
 	dependencies: [libwebsockets_dep, jansson_dep])
 
-install_headers('include/webfuse_provider.h', subdir: 'webfuse')
-install_subdir('include/webfuse/provider', install_dir: 'include/webfuse')
+install_subdir('include/webfuse_provider', install_dir: 'include')
 
 pkg_config.generate(
     libraries: [webfuse_provider],
@@ -109,7 +91,7 @@ gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_
 gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_dep'])
 
 fscheck = executable('fs_check',
-	'test/webfuse/tests/integration/fs_check.c')
+	'test/webfuse_provider/tests/integration/fs_check.c')
 
 openssl = find_program('openssl')
 test_server_certs = custom_target('test_server_certs',
@@ -123,46 +105,46 @@ test_certs_dep = declare_dependency(
 	sources: [test_server_certs, test_client_certs])
 
 alltests = executable('alltests',
-	'test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc',
-	'test/webfuse/tests/core/jsonrpc/mock_timer.cc',
-	'test/webfuse/tests/core/jsonrpc/test_is_request.cc',
-	'test/webfuse/tests/core/jsonrpc/test_request.cc',
-	'test/webfuse/tests/core/jsonrpc/test_is_response.cc',
-	'test/webfuse/tests/core/jsonrpc/test_response.cc',
-	'test/webfuse/tests/core/jsonrpc/test_server.cc',
-	'test/webfuse/tests/core/jsonrpc/test_proxy.cc',
-	'test/webfuse/tests/core/jsonrpc/test_response_parser.cc',
-	'test/webfuse/tests/core/timer/test_timepoint.cc',
-	'test/webfuse/tests/core/timer/test_timer.cc',
-	'test/webfuse/utils/tempdir.cc',
-	'test/webfuse/utils/file_utils.cc',
-	'test/webfuse/utils/timeout_watcher.cc',
-	'test/webfuse/utils/path.c',
-	'test/webfuse/utils/static_filesystem.c',
-	'test/webfuse/utils/ws_server.cc',
-	'test/webfuse/utils/ws_server2.cc',
-	'test/webfuse/utils/jansson_test_environment.cc',
-	'test/webfuse/mocks/fake_invokation_context.cc',
-	'test/webfuse/mocks/mock_request.cc',
-	'test/webfuse/mocks/mock_provider_client.cc',
-	'test/webfuse/mocks/mock_provider.cc',
-	'test/webfuse/mocks/mock_jsonrpc_proxy.cc',
-	'test/webfuse//tests/core/test_util.cc',
-	'test/webfuse/tests/core/test_container_of.cc',
-	'test/webfuse/tests/core/test_slist.cc',
-	'test/webfuse/tests/core/test_base64.cc',
-	'test/webfuse/tests/core/test_status.cc',
-	'test/webfuse/tests/core/test_message.cc',
-	'test/webfuse/tests/core/test_message_queue.cc',
-	'test/webfuse/tests/core/test_url.cc',
-	'test/webfuse/tests/provider/test_client_protocol.cc',
-	'test/webfuse/tests/provider/test_dirbuffer.cc',
-	'test/webfuse/tests/provider/operation/test_close.cc',
-	'test/webfuse/tests/provider/operation/test_getattr.cc',
-	'test/webfuse/tests/provider/operation/test_lookup.cc',
-	'test/webfuse/tests/provider/operation/test_open.cc',
-	'test/webfuse/tests/provider/operation/test_read.cc',
-	'test/webfuse/tests/provider/operation/test_readdir.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/mock_timer_callback.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/mock_timer.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_is_request.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_request.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_is_response.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_response.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_server.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_proxy.cc',
+	'test/webfuse_provider/tests/core/jsonrpc/test_response_parser.cc',
+	'test/webfuse_provider/tests/core/timer/test_timepoint.cc',
+	'test/webfuse_provider/tests/core/timer/test_timer.cc',
+	'test/webfuse_provider/utils/tempdir.cc',
+	'test/webfuse_provider/utils/file_utils.cc',
+	'test/webfuse_provider/utils/timeout_watcher.cc',
+	'test/webfuse_provider/utils/path.c',
+	'test/webfuse_provider/utils/static_filesystem.c',
+	'test/webfuse_provider/utils/ws_server.cc',
+	'test/webfuse_provider/utils/ws_server2.cc',
+	'test/webfuse_provider/utils/jansson_test_environment.cc',
+	'test/webfuse_provider/mocks/fake_invokation_context.cc',
+	'test/webfuse_provider/mocks/mock_request.cc',
+	'test/webfuse_provider/mocks/mock_provider_client.cc',
+	'test/webfuse_provider/mocks/mock_provider.cc',
+	'test/webfuse_provider/mocks/mock_jsonrpc_proxy.cc',
+	'test/webfuse_provider//tests/core/test_util.cc',
+	'test/webfuse_provider/tests/core/test_container_of.cc',
+	'test/webfuse_provider/tests/core/test_slist.cc',
+	'test/webfuse_provider/tests/core/test_base64.cc',
+	'test/webfuse_provider/tests/core/test_status.cc',
+	'test/webfuse_provider/tests/core/test_message.cc',
+	'test/webfuse_provider/tests/core/test_message_queue.cc',
+	'test/webfuse_provider/tests/core/test_url.cc',
+	'test/webfuse_provider/tests/provider/test_client_protocol.cc',
+	'test/webfuse_provider/tests/provider/test_dirbuffer.cc',
+	'test/webfuse_provider/tests/provider/operation/test_close.cc',
+	'test/webfuse_provider/tests/provider/operation/test_getattr.cc',
+	'test/webfuse_provider/tests/provider/operation/test_lookup.cc',
+	'test/webfuse_provider/tests/provider/operation/test_open.cc',
+	'test/webfuse_provider/tests/provider/operation/test_read.cc',
+	'test/webfuse_provider/tests/provider/operation/test_readdir.cc',
 	link_args: [
 		'-Wl,--wrap=wf_timer_manager_create',
 		'-Wl,--wrap=wf_timer_manager_dispose',
@@ -175,10 +157,9 @@ alltests = executable('alltests',
 		'-Wl,--wrap=wf_jsonrpc_proxy_vinvoke',
 		'-Wl,--wrap=wf_jsonrpc_proxy_vnotify',
 	],
-	include_directories: [private_inc_dir, 'test'],
+	include_directories: ['include', 'lib', 'test'],
 	dependencies: [
 		webfuse_provider_static_dep,
-		webfuse_core_dep,
 		libwebsockets_dep,
 		jansson_dep,
 		gtest_dep,
@@ -195,13 +176,13 @@ endif
 if not without_examples
 
 executable('webfuse-provider',
-    'examples/src/main.c',
+    'examples/provider/main.c',
     dependencies: [webfuse_provider_dep])
 
 executable('static-filesystem-provider',
-	'examples/src/static_filesystem/static_filesystem.c',
-	'examples/src/static_filesystem/path.c',
-	'examples/src/static_filesystem/main.c',
+	'examples/static_filesystem/static_filesystem.c',
+	'examples/static_filesystem/path.c',
+	'examples/static_filesystem/main.c',
     dependencies: [webfuse_provider_dep])
 
 

test/webfuse_provider/mocks/fake_invokation_context.cc

@@ -1,4 +1,4 @@
-#include "webfuse/mocks/fake_invokation_context.hpp"
+#include "webfuse_provider/mocks/fake_invokation_context.hpp"
 
 namespace webfuse_test
 {