diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index db35c5d1e7..3d6ba75893 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -41,6 +41,8 @@
 
 #include <dialog_edit_components_libid_base.h>
 #include <wx/tokenzr.h>
+#include <wx/choicdlg.h>
+#include <wx/dcclient.h>
 #include <grid_tricks.h>
 #include <widgets/grid_text_button_helpers.h>
 
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index cf8eeaa3bd..a4eaeacd01 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -32,6 +32,8 @@
 #include <html_messagebox.h>
 #include <macros.h>
 
+#include <wx/msgdlg.h>
+
 /* Read a gerber file, RS274D, RS274X or RS274X2 format.
  */
 bool GERBVIEW_FRAME::Read_GERBER_File( const wxString& GERBER_FullFileName )