diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp
index b0ad24734a..44bc72f9eb 100644
--- a/modules/juce_graphics/juce_graphics.cpp
+++ b/modules/juce_graphics/juce_graphics.cpp
@@ -205,15 +205,19 @@
  #include "native/juce_IconHelpers_mac.cpp"
 
 #elif JUCE_WINDOWS
+ #include "native/juce_Direct2DMetrics_windows.h"
+ #include "native/juce_Direct2DGraphicsContext_windows.h"
+ #include "native/juce_Direct2DHwndContext_windows.h"
  #include "native/juce_DirectX_windows.h"
+ #include "native/juce_Direct2DImage_windows.h"
+ #include "native/juce_Direct2DImageContext_windows.h"
+
  #include "native/juce_DirectWriteTypeface_windows.cpp"
  #include "native/juce_IconHelpers_windows.cpp"
  #include "native/juce_Direct2DHelpers_windows.cpp"
  #include "native/juce_Direct2DResources_windows.cpp"
- #include "native/juce_Direct2DImage_windows.h"
  #include "native/juce_Direct2DGraphicsContext_windows.cpp"
  #include "native/juce_Direct2DHwndContext_windows.cpp"
- #include "native/juce_Direct2DImageContext_windows.h"
  #include "native/juce_Direct2DImageContext_windows.cpp"
  #include "native/juce_Direct2DImage_windows.cpp"
  #include "native/juce_Direct2DMetrics_windows.cpp"
diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h
index c580afd51c..80c8128686 100644
--- a/modules/juce_graphics/juce_graphics.h
+++ b/modules/juce_graphics/juce_graphics.h
@@ -154,9 +154,3 @@ namespace juce
  #include "native/juce_CoreGraphicsHelpers_mac.h"
  #include "native/juce_CoreGraphicsContext_mac.h"
 #endif
-
-#if JUCE_WINDOWS
- #include "native/juce_Direct2DMetrics_windows.h"
- #include "native/juce_Direct2DGraphicsContext_windows.h"
- #include "native/juce_Direct2DHwndContext_windows.h"
-#endif
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index 718928ea82..fb58ef20bd 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -197,7 +197,12 @@
  #include "native/juce_MouseCursor_mac.mm"
 
 #elif JUCE_WINDOWS
+ #include <juce_graphics/native/juce_Direct2DMetrics_windows.h>
+ #include <juce_graphics/native/juce_Direct2DGraphicsContext_windows.h>
+ #include <juce_graphics/native/juce_Direct2DHwndContext_windows.h>
  #include <juce_graphics/native/juce_DirectX_windows.h>
+ #include <juce_graphics/native/juce_Direct2DImage_windows.h>
+ #include <juce_graphics/native/juce_Direct2DImageContext_windows.h>
 
  #include "native/accessibility/juce_WindowsUIAWrapper_windows.h"
  #include "native/accessibility/juce_AccessibilityElement_windows.h"