diff --git a/core/benchmarks/bm-nosonar_node_api.cpp b/core/benchmarks/bm-nosonar_node_api.cpp
index 40309bf78..53c95e3b9 100644
--- a/core/benchmarks/bm-nosonar_node_api.cpp
+++ b/core/benchmarks/bm-nosonar_node_api.cpp
@@ -5,8 +5,7 @@
 
 #include <vir/simd.h>
 
-// #include <gnuradio-4.0/BlockTraits.hpp> // TODO: fix header recursion (if this is enabled instead of the next one)
-#include <gnuradio-4.0/Block.hpp>
+#include <gnuradio-4.0/BlockTraits.hpp>
 #include <gnuradio-4.0/Graph.hpp>
 #include <gnuradio-4.0/Scheduler.hpp>
 
diff --git a/core/include/gnuradio-4.0/Port.hpp b/core/include/gnuradio-4.0/Port.hpp
index d364de265..1fe0f5fd5 100644
--- a/core/include/gnuradio-4.0/Port.hpp
+++ b/core/include/gnuradio-4.0/Port.hpp
@@ -8,7 +8,6 @@
 #include <gnuradio-4.0/meta/utils.hpp>
 
 #include "annotated.hpp"
-#include "Block.hpp"
 #include "CircularBuffer.hpp"
 #include "DataSet.hpp"
 #include "Tag.hpp"
diff --git a/core/include/gnuradio-4.0/Settings.hpp b/core/include/gnuradio-4.0/Settings.hpp
index d0885a198..2218cc951 100644
--- a/core/include/gnuradio-4.0/Settings.hpp
+++ b/core/include/gnuradio-4.0/Settings.hpp
@@ -10,7 +10,6 @@
 #include <variant>
 
 #include "annotated.hpp"
-#include "Block.hpp"
 #include "BlockTraits.hpp"
 #include "reflection.hpp"
 #include "Tag.hpp"