diff --git a/include/villas/nodes/rtp.hpp b/include/villas/nodes/rtp.hpp
index f1e0dca3b..0b33bf175 100644
--- a/include/villas/nodes/rtp.hpp
+++ b/include/villas/nodes/rtp.hpp
@@ -21,9 +21,11 @@
 #include <villas/queue_signalled.h>
 
 extern "C" {
+// clang-format off
 #include <re/re_types.h>
-#include <re/re_rtp.h>
 #include <re/re_sa.h>
+#include <re/re_rtp.h>
+// clang-format on
 }
 
 namespace villas {
diff --git a/lib/nodes/rtp.cpp b/lib/nodes/rtp.cpp
index a503ef326..be2ad20a0 100644
--- a/lib/nodes/rtp.cpp
+++ b/lib/nodes/rtp.cpp
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <cinttypes>
 #include <cstring>
 #include <ctime>
 #include <pthread.h>
@@ -16,15 +15,10 @@
 
 extern "C" {
 // clang-format off
-#include <re/re_types.h>
-#include <re/re_net.h>
 #include <re/re_main.h>
-#include <re/re_types.h>
 #include <re/re_mbuf.h>
 #include <re/re_mem.h>
-#include <re/re_sys.h>
-#include <re/re_udp.h>
-// clang-format off
+// clang-format on
 #undef ALIGN_MASK
 }