diff --git a/include/villas/nodes/can.hpp b/include/villas/nodes/can.hpp
index 67df532df..abcf870d5 100644
--- a/include/villas/nodes/can.hpp
+++ b/include/villas/nodes/can.hpp
@@ -29,12 +29,14 @@
 
 #pragma once
 
-#include "villas/signal_list.h"
-#include <villas/node/config.h>
-#include <villas/node.h>
-#include <villas/io.h>
+#include <jansson.h>
+
 #include <villas/timing.h>
 
+/* Forward declarations */
+struct node;
+union signal_data;
+
 struct can_signal {
     uint32_t id;
     int offset;
diff --git a/lib/nodes/can.cpp b/lib/nodes/can.cpp
index 6b0119421..64dee02eb 100644
--- a/lib/nodes/can.cpp
+++ b/lib/nodes/can.cpp
@@ -20,11 +20,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include "villas/signal_data.h"
-#include "villas/signal_list.h"
-#include "villas/signal_type.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 
 #include <net/if.h>