diff --git a/include/villas/api.h b/include/villas/api.h
index 2757b62b6..f64a511bf 100644
--- a/include/villas/api.h
+++ b/include/villas/api.h
@@ -25,6 +25,7 @@
 
 #include <jansson.h>
 #include <pthread.h>
+#include <libwebsockets.h>
 
 #include <villas/list.h>
 #include <villas/common.h>
@@ -36,8 +37,6 @@ extern "C" {
 #endif
 
 /* Forward declarations */
-struct lws;
-enum lws_callback_reasons;
 struct super_node;
 
 struct api;
diff --git a/include/villas/sample.h b/include/villas/sample.h
index 7ca08cea6..942b5d068 100644
--- a/include/villas/sample.h
+++ b/include/villas/sample.h
@@ -23,15 +23,22 @@
 
 #pragma once
 
-#include <villas/atomic.h>
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <complex.h>
+#include <stdbool.h>
 #include <time.h>
 
+/* "I" defined by complex.h collides with a define in OpenSSL */
+#undef I
+#define J _Complex_I
+
+
+#include <villas/atomic.h>
+#include <villas/signal.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/nodes/influxdb.c b/lib/nodes/influxdb.c
index 416469616..491aab035 100644
--- a/lib/nodes/influxdb.c
+++ b/lib/nodes/influxdb.c
@@ -22,6 +22,9 @@
 
 #include <string.h>
 #include <inttypes.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 
 #include <villas/node.h>
 #include <villas/plugin.h>
diff --git a/lib/nodes/socket.c b/lib/nodes/socket.c
index 79db743b0..0f889a669 100644
--- a/lib/nodes/socket.c
+++ b/lib/nodes/socket.c
@@ -21,8 +21,10 @@
  *********************************************************************************/
 
 #include <unistd.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <netdb.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <errno.h>