diff --git a/include/villas/api.h b/include/villas/api.h
index 6a9a1a37b..c8fb430f8 100644
--- a/include/villas/api.h
+++ b/include/villas/api.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include <libwebsockets.h>
 #include <jansson.h>
 #include <pthread.h>
 
@@ -39,6 +38,7 @@ extern "C"{
 
 /* Forward declarations */
 struct lws;
+enum lws_callback_reasons;
 struct super_node;
 
 struct api;
@@ -58,7 +58,7 @@ struct api {
 
 	struct list sessions;		/**< List of currently active connections */
 	struct queue_signalled pending;	/**< A queue of api_sessions which have pending requests. */
-	
+
 	pthread_t thread;
 
 	struct super_node *super_node;
@@ -88,4 +88,4 @@ int api_http_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/include/villas/nodes/websocket.h b/include/villas/nodes/websocket.h
index dd8d770b3..76b900cf2 100644
--- a/include/villas/nodes/websocket.h
+++ b/include/villas/nodes/websocket.h
@@ -29,8 +29,6 @@
 
 #pragma once
 
-#include <libwebsockets.h>
-
 #include <villas/node.h>
 #include <villas/pool.h>
 #include <villas/queue_signalled.h>
diff --git a/lib/api/session.c b/lib/api/session.c
index e421bff79..f5f4ce62d 100644
--- a/lib/api/session.c
+++ b/lib/api/session.c
@@ -20,6 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
+#include <libwebsockets.h>
+
 #include <villas/api/session.h>
 #include <villas/web.h>
 #include <villas/plugin.h>
diff --git a/lib/nodes/websocket.c b/lib/nodes/websocket.c
index 2f2faf8cf..2946c5922 100644
--- a/lib/nodes/websocket.c
+++ b/lib/nodes/websocket.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <signal.h>
 
+#include <libwebsockets.h>
+
 #include <villas/super_node.h>
 #include <villas/timing.h>
 #include <villas/utils.h>