diff --git a/core/templates/fixed_vector.h b/core/templates/fixed_vector.h
index e1a47449b2a..a7907caaec4 100644
--- a/core/templates/fixed_vector.h
+++ b/core/templates/fixed_vector.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#include "core/templates/span.h"
+
 /**
  * A high performance Vector of fixed capacity.
  * Especially useful if you need to create an array on the stack, to
diff --git a/core/templates/span.h b/core/templates/span.h
index 66f0ca2e24f..7d6ed50588c 100644
--- a/core/templates/span.h
+++ b/core/templates/span.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 // Equivalent of std::span.