diff --git a/src/GafferImage/Format.cpp b/src/GafferImage/Format.cpp
index 2a9e78ba752..b7be4c97ea2 100644
--- a/src/GafferImage/Format.cpp
+++ b/src/GafferImage/Format.cpp
@@ -35,6 +35,9 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "GafferImage/Format.h"
+#include "GafferImage/FormatData.h"
+
+#include "Gaffer/Context.h"
 
 #include <map>
 
@@ -43,6 +46,8 @@ using namespace GafferImage;
 namespace
 {
 
+Gaffer::Context::TypeDescription<GafferImage::FormatData> g_formatDataTypeDescription;
+
 typedef std::map<std::string, Format> FormatMap;
 
 FormatMap &formatMap()
diff --git a/src/GafferImage/FormatData.cpp b/src/GafferImage/FormatData.cpp
index ab5c604da99..ea39d71e63d 100644
--- a/src/GafferImage/FormatData.cpp
+++ b/src/GafferImage/FormatData.cpp
@@ -39,20 +39,11 @@
 #include "GafferImage/Export.h"
 #include "GafferImage/TypeIds.h"
 
-#include "Gaffer/Context.h"
-
 #include "IECore/TypedData.h"
 #include "IECore/TypedData.inl"
 
 using namespace Imath;
 
-namespace
-{
-
-Gaffer::Context::TypeDescription<GafferImage::FormatData> g_formatDataTypeDescription;
-
-} // namespace
-
 namespace IECore
 {