Kill the last of wx/wx.h in headers

common/dialogs/wx_html_report_box.h

@@ -20,7 +20,6 @@
 #ifndef WX_HTML_REPORT_BOX_H
 #define WX_HTML_REPORT_BOX_H
 
-#include <wx/wx.h>
 #include <reporter.h>
 #include <vector>
 #include <wx/html/htmlwin.h>

common/widgets/collapsible_pane.cpp

@@ -21,10 +21,18 @@
 #include <widgets/collapsible_pane.h>
 
 #include <wx/collpane.h>
+#include <wx/dc.h>
+#include <wx/dcclient.h>
+#include <wx/panel.h>
 #include <wx/renderer.h>
+#include <wx/sizer.h>
 #include <wx/toplevel.h>
 #include <wx/window.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include <algorithm>
 
 

eeschema/dialogs/dialog_erc.cpp

@@ -46,6 +46,7 @@
 #include <widgets/infobar.h>
 #include <dialogs/wx_html_report_box.h>
 #include <wx/ffile.h>
+#include <wx/filedlg.h>
 #include <wx/hyperlink.h>
 #include <erc_item.h>
 #include <eeschema_settings.h>

eeschema/files-io.cpp

@@ -58,6 +58,8 @@
 #include <wildcards_and_files_ext.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <wx/ffile.h>
+#include <wx/filedlg.h>
+#include <wx/log.h>
 #include <tools/ee_actions.h>
 #include <tools/ee_inspection_tool.h>
 #include <paths.h>

include/widgets/collapsible_pane.h

@@ -20,7 +20,8 @@
 #ifndef KICAD_COLLAPSIBLE_PANE_H
 #define KICAD_COLLAPSIBLE_PANE_H
 
-#include <wx/wx.h>
+#include <wx/control.h>
+#include <wx/containr.h>
 
 
 wxDECLARE_EVENT( WX_COLLAPSIBLE_PANE_HEADER_CHANGED, wxCommandEvent );

include/widgets/mathplot.h

@@ -64,7 +64,6 @@
 
 #include <vector>
 
-// #include <wx/wx.h>
 #include <wx/defs.h>
 #include <wx/menu.h>
 #include <wx/scrolwin.h>

pcbnew/dialogs/dialog_drc.cpp

@@ -36,6 +36,7 @@
 #include <tools/pcb_actions.h>
 #include <wildcards_and_files_ext.h>
 #include <pcb_marker.h>
+#include <wx/filedlg.h>
 #include <wx/wupdlock.h>
 #include <widgets/appearance_controls.h>
 #include <widgets/ui_common.h>

pcbnew/footprint_preview_panel.h

@@ -22,8 +22,6 @@
 #ifndef __FOOTPRINT_PREVIEW_PANEL_H
 #define __FOOTPRINT_PREVIEW_PANEL_H
 
-#include <wx/wx.h>
-
 #include <map>
 #include <deque>
 #include <functional>

pcbnew/widgets/appearance_controls.cpp

@@ -43,8 +43,14 @@
 #include <widgets/indicator_icon.h>
 #include <widgets/infobar.h>
 #include <widgets/wx_grid.h>
+#include <wx/bmpbuttn.h>
+#include <wx/checkbox.h>
 #include <wx/hyperlink.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
 #include <wx/statline.h>
+#include <wx/textdlg.h>
 
 
 NET_GRID_TABLE::NET_GRID_TABLE( PCB_BASE_FRAME* aFrame, wxColor aBackgroundColor ) :