diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 7e44ef7221..7ee884e232 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,6 +14,7 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
+#include "wx/dc.h"
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
 #include "wx/graphics.h"
diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index cedac4899b..348af4a93f 100644
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -25,11 +25,14 @@
 
 #if wxUSE_NOTIFICATION_MESSAGE && wxUSE_TASKBARICON
 
+#include "wx/notifmsg.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/toplevel.h"
+    #include "wx/app.h"
     #include "wx/string.h"
 #endif // WX_PRECOMP
 
-#include "wx/notifmsg.h"
 #include "wx/generic/notifmsg.h"
 
 #include "wx/taskbar.h"
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index dad65db005..90ea2a60af 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -25,6 +25,7 @@
     #include "wx/memory.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/evtloop.h"