diff --git a/include/rfl/internal/is_attribute.hpp b/include/rfl/internal/is_attribute.hpp
index bdddaf75..ce47198e 100644
--- a/include/rfl/internal/is_attribute.hpp
+++ b/include/rfl/internal/is_attribute.hpp
@@ -5,12 +5,11 @@
 #include <type_traits>
 #include <utility>
 
+#include "../Attribute.hpp"
 #include "../Field.hpp"
 
 namespace rfl {
 
-template <class T> struct Attribute;
-
 namespace internal {
 
 template <class T>
diff --git a/include/rfl/parsing/NamedTupleParser.hpp b/include/rfl/parsing/NamedTupleParser.hpp
index 0af5607a..863304d7 100644
--- a/include/rfl/parsing/NamedTupleParser.hpp
+++ b/include/rfl/parsing/NamedTupleParser.hpp
@@ -11,6 +11,8 @@
 #include "../internal/Memoization.hpp"
 #include "../internal/is_basic_type.hpp"
 #include "../internal/strings/replace_all.hpp"
+#include "AreReaderAndWriter.hpp"
+#include "Parser_base.hpp"
 #include "is_required.hpp"
 
 namespace rfl {
diff --git a/tests/flexbuffers/test_all_of.cpp b/tests/flexbuffers/test_all_of.cpp
index 13cf70db..a75d37a8 100644
--- a/tests/flexbuffers/test_all_of.cpp
+++ b/tests/flexbuffers/test_all_of.cpp
@@ -1,12 +1,15 @@
 #include "test_all_of.hpp"
 
 #include <iostream>
-#include <rfl.hpp>
 #include <rfl/flexbuf.hpp>
 #include <source_location>
 #include <string>
 #include <vector>
 
+// Make sure things still compile when
+// rfl.hpp is included after rfl/flexbuf.hpp.
+#include <rfl.hpp>
+
 #include "write_and_read.hpp"
 
 namespace test_all_of {
diff --git a/tests/json/test_all_of.cpp b/tests/json/test_all_of.cpp
index 87501b0c..a296d1a3 100644
--- a/tests/json/test_all_of.cpp
+++ b/tests/json/test_all_of.cpp
@@ -1,12 +1,15 @@
 #include "test_all_of.hpp"
 
 #include <iostream>
-#include <rfl.hpp>
 #include <rfl/json.hpp>
 #include <source_location>
 #include <string>
 #include <vector>
 
+// Make sure things still compile when
+// rfl.hpp is included after rfl/json.hpp.
+#include <rfl.hpp>
+
 #include "write_and_read.hpp"
 
 namespace test_all_of {
diff --git a/tests/xml/test_array.cpp b/tests/xml/test_array.cpp
index 7485cbfe..bcc21feb 100644
--- a/tests/xml/test_array.cpp
+++ b/tests/xml/test_array.cpp
@@ -3,11 +3,14 @@
 #include <array>
 #include <iostream>
 #include <memory>
-#include <rfl.hpp>
-#include <rfl/json.hpp>
+#include <rfl/xml.hpp>
 #include <source_location>
 #include <string>
 
+// Make sure things still compile when
+// rfl.hpp is included after rfl/xml.hpp.
+#include <rfl.hpp>
+
 #include "write_and_read.hpp"
 
 namespace test_array {