diff --git a/wrap/TypeAttributesTable.cpp b/wrap/TypeAttributesTable.cpp
index 18c034776..887261d19 100644
--- a/wrap/TypeAttributesTable.cpp
+++ b/wrap/TypeAttributesTable.cpp
@@ -18,6 +18,7 @@
 
 #include "TypeAttributesTable.h"
 #include "Class.h"
+#include "ForwardDeclaration.h"
 #include "utilities.h"
 
 #include <boost/range/adaptor/map.hpp>
diff --git a/wrap/TypeAttributesTable.h b/wrap/TypeAttributesTable.h
index a48fecb3c..132e2cda1 100644
--- a/wrap/TypeAttributesTable.h
+++ b/wrap/TypeAttributesTable.h
@@ -21,8 +21,6 @@
 #include <string>
 #include <vector>
 
-#include "ForwardDeclaration.h"
-
 #pragma once
 
 namespace wrap {
@@ -30,6 +28,7 @@ namespace wrap {
 // Forward declarations
 class Qualified;
 class Class;
+struct ForwardDeclaration;
 
 /** Attributes about valid classes, both for classes defined in this module and
  * also those forward-declared from others.  At the moment this only contains