diff --git a/3d-viewer/3d_canvas/cinfo3d_visu.h b/3d-viewer/3d_canvas/cinfo3d_visu.h
index d9536ef5ed..702b5c99f8 100644
--- a/3d-viewer/3d_canvas/cinfo3d_visu.h
+++ b/3d-viewer/3d_canvas/cinfo3d_visu.h
@@ -43,7 +43,7 @@
 #include <class_pad.h>
 #include <class_track.h>
 #include <wx/gdicmn.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <class_pcb_text.h>
 #include <class_drawsegment.h>
 #include <class_dimension.h>
diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.h b/3d-viewer/3d_canvas/eda_3d_canvas.h
index f58b2dc92c..809e2a3d76 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.h
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.h
@@ -43,7 +43,7 @@
 #include <wx/wupdlock.h>
 #include <wx/timer.h>
 #include <wx/statusbr.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 
 /**
diff --git a/3d-viewer/3d_rendering/c3d_render_base.h b/3d-viewer/3d_rendering/c3d_render_base.h
index e5af933ad9..8d1d9a1b37 100644
--- a/3d-viewer/3d_rendering/c3d_render_base.h
+++ b/3d-viewer/3d_rendering/c3d_render_base.h
@@ -31,7 +31,7 @@
 #define C3D_RENDER_BASE_H
 
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include "../3d_canvas/cinfo3d_visu.h"
 #include <reporter.h>
 
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 852434e998..4a9d8ac97a 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -26,7 +26,6 @@
 #include <macros.h>
 
 #include <pgm_base.h>
-#include <wxstruct.h>
 #include <confirm.h>
 #include <gestfich.h>
 #include <wildcards_and_files_ext.h>
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ca6e7796ba..2d13f9ba7a 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -228,7 +228,6 @@ set( COMMON_SRCS
     ${COMMON_PREVIEW_ITEMS_SRCS}
     ${PLOTTERS_CONTROL_SRCS}
     base_struct.cpp
-    basicframe.cpp
     bezier_curves.cpp
     bin_mod.cpp
     bitmap.cpp
@@ -252,6 +251,7 @@ set( COMMON_SRCS
     draw_graphic_text.cpp
     dsnlexer.cpp
     eagle_parser.cpp
+    eda_base_frame.cpp
     eda_dde.cpp
     eda_doc.cpp
     eda_pattern_match.cpp
@@ -377,7 +377,7 @@ set( PCB_COMMON_SRCS
     page_info.cpp
     pcb_keywords.cpp
     pcb_plot_params_keywords.cpp
-    ../pcbnew/basepcbframe.cpp
+    ../pcbnew/pcb_base_frame.cpp
     ../pcbnew/board_commit.cpp
     ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/class_board.cpp
diff --git a/common/base_struct.cpp b/common/base_struct.cpp
index 23565fd440..5823dcb108 100644
--- a/common/base_struct.cpp
+++ b/common/base_struct.cpp
@@ -32,7 +32,7 @@
 #include <common.h>
 #include <macros.h>
 #include <kicad_string.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <class_drawpanel.h>
 #include <base_screen.h>
 #include <bitmaps.h>
diff --git a/common/bitmap.cpp b/common/bitmap.cpp
index 2fcde4b7d4..4a09ab49a9 100644
--- a/common/bitmap.cpp
+++ b/common/bitmap.cpp
@@ -37,7 +37,7 @@
 #include <common.h>
 #include <bitmaps.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 
 
 struct SCALED_BITMAP_ID {
diff --git a/common/common.cpp b/common/common.cpp
index 2245ca433b..0ec528cbcc 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <common.h>
 #include <macros.h>
diff --git a/common/config_params.cpp b/common/config_params.cpp
index f522a08341..36eb5e2e38 100644
--- a/common/config_params.cpp
+++ b/common/config_params.cpp
@@ -29,7 +29,7 @@
 #include <common.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <config_params.h>
 
 #include <wx/apptrait.h>
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 2c362f43e4..74259622a7 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -38,7 +38,7 @@
 #include <build_version.h>
 #include <common.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 
 #include "aboutinfo.h"
 #include "dialog_about.h"
diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 32a5dfc95f..05533ba18c 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -37,7 +37,7 @@
 #include <id.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <menus_helpers.h>
 #include <bitmaps.h>
 
diff --git a/common/eda_graphic_text_ctrl.cpp b/common/eda_graphic_text_ctrl.cpp
index 5bd4319a74..0faecc659c 100644
--- a/common/eda_graphic_text_ctrl.cpp
+++ b/common/eda_graphic_text_ctrl.cpp
@@ -27,7 +27,7 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <dialog_helpers.h>
 #include <base_units.h>
 #include <macros.h>
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 7ce719eaf2..917f8b838b 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -35,7 +35,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <macros.h>
 #include <dialog_hotkeys_editor.h>
 #include <menus_helpers.h>
diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index ac0bd475e3..2c22227185 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -41,7 +41,7 @@
 #include <wx/richmsgdlg.h>
 
 #include <pgm_base.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <macros.h>
 #include <config_params.h>
 #include <id.h>
diff --git a/common/plotters/DXF_plotter.cpp b/common/plotters/DXF_plotter.cpp
index af582bcc21..5def33435b 100644
--- a/common/plotters/DXF_plotter.cpp
+++ b/common/plotters/DXF_plotter.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <plotter.h>
 #include <macros.h>
diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp
index 40faaf687a..ddad547b64 100644
--- a/common/plotters/GERBER_plotter.cpp
+++ b/common/plotters/GERBER_plotter.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plotter.h>
diff --git a/common/plotters/HPGL_plotter.cpp b/common/plotters/HPGL_plotter.cpp
index 7eedc444e7..152e25cd11 100644
--- a/common/plotters/HPGL_plotter.cpp
+++ b/common/plotters/HPGL_plotter.cpp
@@ -197,7 +197,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <plotter.h>
 #include <macros.h>
diff --git a/common/plotters/PDF_plotter.cpp b/common/plotters/PDF_plotter.cpp
index 5512d038e3..147c649a97 100644
--- a/common/plotters/PDF_plotter.cpp
+++ b/common/plotters/PDF_plotter.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plotter.h>
diff --git a/common/plotters/PS_plotter.cpp b/common/plotters/PS_plotter.cpp
index df3ca7e707..8e62faf296 100644
--- a/common/plotters/PS_plotter.cpp
+++ b/common/plotters/PS_plotter.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plotter.h>
diff --git a/common/plotters/SVG_plotter.cpp b/common/plotters/SVG_plotter.cpp
index 13706a9e30..66248c6b07 100644
--- a/common/plotters/SVG_plotter.cpp
+++ b/common/plotters/SVG_plotter.cpp
@@ -92,7 +92,7 @@
  */
 #include <fctsys.h>
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <eda_rect.h>
 #include <base_struct.h>
 #include <common.h>
diff --git a/common/plotters/plotter.cpp b/common/plotters/plotter.cpp
index 4aba918317..489508cc90 100644
--- a/common/plotters/plotter.cpp
+++ b/common/plotters/plotter.cpp
@@ -40,7 +40,7 @@
 #include <fctsys.h>
 
 #include <trigo.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plotter.h>
diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index a19ce9937b..fdecae8ec2 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <wxPcbStruct.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
diff --git a/cvpcb/components_listbox.cpp b/cvpcb/components_listbox.cpp
index 4da5c47776..f8a97191d1 100644
--- a/cvpcb/components_listbox.cpp
+++ b/cvpcb/components_listbox.cpp
@@ -26,7 +26,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 
 #include <cvpcb.h>
 #include <cvpcb_mainframe.h>
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index 9e68f7aec4..2d42bbc261 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -32,7 +32,7 @@
 #include <fp_lib_table.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
+//#include <wxstruct.h>
 #include <confirm.h>
 
 #include <cvpcb.h>
diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h
index 5b22f2d5e7..0891e730be 100644
--- a/cvpcb/cvpcb_mainframe.h
+++ b/cvpcb/cvpcb_mainframe.h
@@ -34,7 +34,7 @@
 #include <pcb_netlist.h>
 #include <footprint_info.h>
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <config_params.h>
 #include <auto_associate.h>
 #include <memory>
diff --git a/cvpcb/dialogs/dialog_display_options.cpp b/cvpcb/dialogs/dialog_display_options.cpp
index 19f9b9a929..e04cc0ec71 100644
--- a/cvpcb/dialogs/dialog_display_options.cpp
+++ b/cvpcb/dialogs/dialog_display_options.cpp
@@ -27,7 +27,7 @@
 
 #include <fctsys.h>
 
-#include <wxstruct.h>
+//#include <wxstruct.h>
 #include <common.h>
 #include <cvpcb.h>
 #include <class_drawpanel.h>
diff --git a/cvpcb/display_footprints_frame.h b/cvpcb/display_footprints_frame.h
index 19c98ed9c0..68fb1e4d4f 100644
--- a/cvpcb/display_footprints_frame.h
+++ b/cvpcb/display_footprints_frame.h
@@ -27,7 +27,7 @@
  */
 
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 // The name (for wxWidgets) of the footprint viewer frame
 #define FOOTPRINTVIEWER_FRAME_NAME wxT( "FootprintViewerFrame" )
diff --git a/cvpcb/footprints_listbox.cpp b/cvpcb/footprints_listbox.cpp
index 3679fc15b1..fef6774ee6 100644
--- a/cvpcb/footprints_listbox.cpp
+++ b/cvpcb/footprints_listbox.cpp
@@ -28,7 +28,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <wx/wupdlock.h>
 
 #include <cvpcb.h>
diff --git a/cvpcb/library_listbox.cpp b/cvpcb/library_listbox.cpp
index 8a449fed7a..c9d8e4fa9c 100644
--- a/cvpcb/library_listbox.cpp
+++ b/cvpcb/library_listbox.cpp
@@ -27,7 +27,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <macros.h>
 
 #include <cvpcb.h>
diff --git a/cvpcb/listbox_base.cpp b/cvpcb/listbox_base.cpp
index 37d6508ef7..d2c42d3330 100644
--- a/cvpcb/listbox_base.cpp
+++ b/cvpcb/listbox_base.cpp
@@ -27,7 +27,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <macros.h>
 
 #include <cvpcb.h>
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index ec97169670..eec1a7cfec 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -32,10 +32,10 @@
 #include <kiface_i.h>
 #include <gr_basic.h>
 #include <macros.h>
+#include <eda_base_frame.h>
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <eda_doc.h>
-#include <wxstruct.h>
 #include <richio.h>
 #include <config_params.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index ff8aa70d67..c55b7cc6f2 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -32,7 +32,6 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index 3ae9de6962..c727e2f45a 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -31,7 +31,6 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <bezier_curves.h>
 #include <base_units.h>
 #include <msgpanel.h>
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index d13f482742..d513360364 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -33,7 +33,6 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/lib_draw_item.cpp b/eeschema/lib_draw_item.cpp
index efd9986af4..7acacd235a 100644
--- a/eeschema/lib_draw_item.cpp
+++ b/eeschema/lib_draw_item.cpp
@@ -30,7 +30,6 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxstruct.h>
 #include <msgpanel.h>
 
 #include <general.h>
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index d7222add7f..9113d1f928 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -32,7 +32,6 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index 922679819b..187c2d5e6e 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -32,7 +32,6 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index d33b1878f9..ca758a5d50 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -32,7 +32,6 @@
 #include <plotter.h>
 #include <draw_graphic_text.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 9331e9bb33..3c899f7454 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -30,7 +30,6 @@
 
 #include <fctsys.h>
 #include <confirm.h>
-#include <wxstruct.h>
 #include <wildcards_and_files_ext.h>
 
 #include <class_sch_screen.h>
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index e2234bd2f8..3b04455b0d 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -28,13 +28,11 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 
-#include <general.h>
 #include <sch_marker.h>
 #include <erc.h>
 
diff --git a/eeschema/template_fieldnames.h b/eeschema/template_fieldnames.h
index ab76a3f054..66e33dad8d 100644
--- a/eeschema/template_fieldnames.h
+++ b/eeschema/template_fieldnames.h
@@ -27,7 +27,6 @@
 #define _TEMPLATE_FIELDNAME_H_
 
 #include <richio.h>
-#include <wxstruct.h>
 #include <macros.h>
 #include <template_fieldnames_lexer.h>
 
diff --git a/gerbview/DCodeSelectionbox.cpp b/gerbview/DCodeSelectionbox.cpp
index 5b54ff5663..34e67d7552 100644
--- a/gerbview/DCodeSelectionbox.cpp
+++ b/gerbview/DCodeSelectionbox.cpp
@@ -23,8 +23,8 @@
  */
 
 #include <fctsys.h>
+#include <wx/aui/aui.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
 #include <dcode.h>
 
 #include <DCodeSelectionbox.h>
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index b63721d2dc..14aea7c04b 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -25,7 +25,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <class_drawpanel.h>
 #include <build_version.h>
 #include <trigo.h>
diff --git a/gerbview/printout_control.cpp b/gerbview/printout_control.cpp
index ee261a964a..577f0a8e90 100644
--- a/gerbview/printout_control.cpp
+++ b/gerbview/printout_control.cpp
@@ -33,7 +33,6 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <base_units.h>
-#include <wxstruct.h>
 #include <base_screen.h>
 
 #include <gerbview_frame.h>
diff --git a/include/draw_frame.h b/include/draw_frame.h
index b69819dc3a..87dfced799 100644
--- a/include/draw_frame.h
+++ b/include/draw_frame.h
@@ -26,7 +26,7 @@
 #ifndef DRAW_FRAME_H_
 #define DRAW_FRAME_H_
 
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <kiway_player.h>
 #include <climits>
 #include <gal/gal_display_options.h>
diff --git a/include/kiway_player.h b/include/kiway_player.h
index 6eefa80033..613a41ab8e 100644
--- a/include/kiway_player.h
+++ b/include/kiway_player.h
@@ -27,7 +27,7 @@
 
 #include <wx/frame.h>
 #include <vector>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 
 
 class KIWAY;
diff --git a/kicad/kicad.h b/kicad/kicad.h
index 9a304ed118..06c198e7f1 100644
--- a/kicad/kicad.h
+++ b/kicad/kicad.h
@@ -34,7 +34,7 @@
 #include <wx/process.h>
 
 #include <id.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 
 
 #define KICAD_MANAGER_FRAME_NAME   wxT( "KicadFrame" )
diff --git a/pagelayout_editor/properties_frame.cpp b/pagelayout_editor/properties_frame.cpp
index 56f38252f5..0c4b980855 100644
--- a/pagelayout_editor/properties_frame.cpp
+++ b/pagelayout_editor/properties_frame.cpp
@@ -27,7 +27,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <class_drawpanel.h>
 #include <worksheet_shape_builder.h>
 #include <worksheet_dataitem.h>
diff --git a/pagelayout_editor/properties_frame.h b/pagelayout_editor/properties_frame.h
index 7cb130ba9c..63275a2cc6 100644
--- a/pagelayout_editor/properties_frame.h
+++ b/pagelayout_editor/properties_frame.h
@@ -29,7 +29,6 @@
 #ifndef  _PROPERTIES_FRAME_H
 #define  _PROPERTIES_FRAME_H
 
-#include <wxstruct.h>
 #include <pl_editor_frame.h>
 #include <dialogs/properties_frame_base.h>
 
diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp
index be74df91c1..62937e913b 100644
--- a/pcb_calculator/pcb_calculator.cpp
+++ b/pcb_calculator/pcb_calculator.cpp
@@ -24,7 +24,6 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
-#include <wxstruct.h>
 #include <confirm.h>
 #include <gestfich.h>
 
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 629f2b9dbe..c5486d816e 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -37,7 +37,7 @@
 #include <fctsys.h>
 #include <common.h>
 #include <kicad_string.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <msgpanel.h>
 #include <pcb_netlist.h>
 #include <reporter.h>
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 390f8f3f4e..043bbdb2cb 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -32,7 +32,6 @@
 #include <macros.h>
 #include <gr_basic.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <class_drawpanel.h>
 #include <kicad_string.h>
 #include <richio.h>
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 210b2aec22..e62c855bf9 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -31,7 +31,6 @@
 
 #include <fctsys.h>
 #include <macros.h>
-#include <wxstruct.h>
 #include <gr_basic.h>
 #include <bezier_curves.h>
 #include <class_drawpanel.h>
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index d47049957e..67c0175f84 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -31,7 +31,6 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <wxstruct.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
 #include <pcb_screen.h>
@@ -40,7 +39,7 @@
 #include <richio.h>
 #include <macros.h>
 #include <math_for_graphics.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_marker_pcb.cpp b/pcbnew/class_marker_pcb.cpp
index 8a90bac81f..a44594400f 100644
--- a/pcbnew/class_marker_pcb.cpp
+++ b/pcbnew/class_marker_pcb.cpp
@@ -31,7 +31,6 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxstruct.h>
 #include <trigo.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 91c11d425d..d4dad5c555 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -31,7 +31,6 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <wxstruct.h>
 #include <plotter.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
diff --git a/pcbnew/class_netinfo_item.cpp b/pcbnew/class_netinfo_item.cpp
index 5c9ec0a5fd..3c3b323b9e 100644
--- a/pcbnew/class_netinfo_item.cpp
+++ b/pcbnew/class_netinfo_item.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <common.h>
 #include <kicad_string.h>
 #include <pcbnew.h>
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 4c86c641df..a15d6f7eca 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -31,7 +31,6 @@
 #include <fctsys.h>
 #include <PolyLine.h>
 #include <trigo.h>
-#include <wxstruct.h>
 #include <macros.h>
 #include <msgpanel.h>
 #include <base_units.h>
diff --git a/pcbnew/class_pad_custom_shape_functions.cpp b/pcbnew/class_pad_custom_shape_functions.cpp
index 7e8942a0d1..2a77f099f4 100644
--- a/pcbnew/class_pad_custom_shape_functions.cpp
+++ b/pcbnew/class_pad_custom_shape_functions.cpp
@@ -30,7 +30,6 @@
 #include <fctsys.h>
 #include <PolyLine.h>
 #include <trigo.h>
-#include <wxstruct.h>
 
 #include <pcbnew.h>
 
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index 006033ce27..9a61b12b48 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -36,7 +36,7 @@
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <wxPcbStruct.h>
 #include <pcbnew_id.h>             // ID_TRACK_BUTT
 #include <pcbnew.h>
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 0331e04743..4f3b557ffa 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -29,7 +29,6 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <gr_basic.h>
 #include <base_struct.h>
 #include <draw_graphic_text.h>
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 30dc794bef..fe77379f3b 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -30,7 +30,6 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <wxstruct.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index 7e5e114795..1d5e3e7719 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -38,8 +38,7 @@
 #include <class_drawpanel.h>
 #include <pcb_screen.h>
 #include <draw_graphic_text.h>
-#include <wxstruct.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <class_board.h>
 #include <class_track.h>
 #include <pcbnew.h>
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index 13eb24f423..13b01e5a60 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -29,14 +29,13 @@
  */
 
 #include <fctsys.h>
-#include <wxstruct.h>
 #include <trigo.h>
 #include <pcb_screen.h>
 #include <class_drawpanel.h>
 #include <kicad_string.h>
 #include <richio.h>
 #include <macros.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 
diff --git a/pcbnew/connect.cpp b/pcbnew/connect.cpp
index 9c1248dc26..0c11dce309 100644
--- a/pcbnew/connect.cpp
+++ b/pcbnew/connect.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <common.h>
 #include <macros.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <view/view.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/dialogs/dialog_SVG_print.cpp b/pcbnew/dialogs/dialog_SVG_print.cpp
index 652e654481..6e4d700428 100644
--- a/pcbnew/dialogs/dialog_SVG_print.cpp
+++ b/pcbnew/dialogs/dialog_SVG_print.cpp
@@ -30,9 +30,8 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <common.h>
-#include <class_drawpanel.h>
-#include <wxBasePcbFrame.h>
-#include <pcb_screen.h>
+#include <pcb_base_frame.h>
+//#include <pcb_screen.h>
 #include <base_units.h>
 #include <convert_to_biu.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/dialogs/dialog_create_array.h b/pcbnew/dialogs/dialog_create_array.h
index b63bb2d74f..8dce009f1d 100644
--- a/pcbnew/dialogs/dialog_create_array.h
+++ b/pcbnew/dialogs/dialog_create_array.h
@@ -29,7 +29,7 @@
 #include <dialog_create_array_base.h>
 
 #include <class_board_item.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 #include <boost/bimap.hpp>
 
diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h
index f39c2dc41c..5e4446a07d 100644
--- a/pcbnew/dialogs/dialog_drc.h
+++ b/pcbnew/dialogs/dialog_drc.h
@@ -32,7 +32,6 @@
 #include <fctsys.h>
 #include <pcbnew.h>
 #include <class_drawpanel.h>
-#include <wxstruct.h>
 #include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_drclistbox.h b/pcbnew/dialogs/dialog_drclistbox.h
index bd6a4be426..402d3b95d7 100644
--- a/pcbnew/dialogs/dialog_drclistbox.h
+++ b/pcbnew/dialogs/dialog_drclistbox.h
@@ -31,7 +31,6 @@
 #include <fctsys.h>
 #include <pcbnew.h>
 #include <class_drawpanel.h>
-#include <wxstruct.h>
 #include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp
index c4dbd72235..7c24c2bbe6 100644
--- a/pcbnew/dialogs/dialog_edit_module_text.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_text.cpp
@@ -38,7 +38,7 @@
 #include <pcbnew.h>
 #include <draw_graphic_text.h>
 #include <confirm.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <wx/numformatter.h>
 #include <board_commit.h>
diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
index 087555941b..77eaadee30 100644
--- a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
+++ b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
+ * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <kicad_string.h>
 #include <macros.h>
diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
index c2088cbb18..a47f88360b 100644
--- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
@@ -35,7 +35,7 @@
 #include <pcbnew.h>
 #include <trigo.h>
 #include <macros.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <unit_format.h>
 #include <gr_basic.h>
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index 28c298777e..2f4df7591c 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -37,7 +37,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <unit_format.h>
 #include <board_commit.h>
diff --git a/pcbnew/dialogs/dialog_pad_properties.h b/pcbnew/dialogs/dialog_pad_properties.h
index d3eb74fd00..6bc9b61b05 100644
--- a/pcbnew/dialogs/dialog_pad_properties.h
+++ b/pcbnew/dialogs/dialog_pad_properties.h
@@ -34,7 +34,7 @@
 
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <wx/valnum.h>
 
diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp
index 155e3636cf..c25953ef3d 100644
--- a/pcbnew/dialogs/dialog_pad_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp
@@ -10422,7 +10422,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="include">#include &lt;wxBasePcbFrame.h&gt;&#x0A;#include &lt;pcb_draw_panel_gal.h&gt;</property>
+                                        <property name="include">#include &lt;pcb_base_frame.h&gt;&#x0A;#include &lt;pcb_draw_panel_gal.h&gt;</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h
index 4134bc8c3a..22f3ad266f 100644
--- a/pcbnew/dialogs/dialog_pad_properties_base.h
+++ b/pcbnew/dialogs/dialog_pad_properties_base.h
@@ -35,7 +35,7 @@ class wxListView;
 #include <wx/listctrl.h>
 #include <wx/button.h>
 #include <wx/notebook.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <pcb_draw_panel_gal.h>
 #include <wx/dialog.h>
 #include <wx/spinctrl.h>
diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp
index 026adeff46..52be537e72 100644
--- a/pcbnew/dialogs/dialog_set_grid.cpp
+++ b/pcbnew/dialogs/dialog_set_grid.cpp
@@ -32,7 +32,7 @@
 #include <convert_to_biu.h>
 #include <common.h>
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <class_drawpanel.h>
 #include <class_draw_panel_gal.h>
 
diff --git a/pcbnew/dragsegm.cpp b/pcbnew/dragsegm.cpp
index 8517b6f60d..715207a314 100644
--- a/pcbnew/dragsegm.cpp
+++ b/pcbnew/dragsegm.cpp
@@ -33,7 +33,7 @@
 #include <trigo.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <macros.h>
 
 #include <drag.h>
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index 3279a64311..21904a48e9 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
 #include <trigo.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <macros.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/module_editor_frame.h b/pcbnew/module_editor_frame.h
index ad325669a0..1ebbdc9edb 100644
--- a/pcbnew/module_editor_frame.h
+++ b/pcbnew/module_editor_frame.h
@@ -25,7 +25,7 @@
 #ifndef MODULE_EDITOR_FRAME_H_
 #define MODULE_EDITOR_FRAME_H_
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <pcb_base_edit_frame.h>
 #include <io_mgr.h>
 #include <config_params.h>
diff --git a/pcbnew/move-drag_pads.cpp b/pcbnew/move-drag_pads.cpp
index 5c0385103c..f40a79dd77 100644
--- a/pcbnew/move-drag_pads.cpp
+++ b/pcbnew/move-drag_pads.cpp
@@ -11,7 +11,7 @@
 #include <class_drawpanel.h>
 #include <trigo.h>
 #include <block_commande.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/pad_edition_functions.cpp b/pcbnew/pad_edition_functions.cpp
index 137495ae68..0a8d1d2330 100644
--- a/pcbnew/pad_edition_functions.cpp
+++ b/pcbnew/pad_edition_functions.cpp
@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <trigo.h>
 #include <macros.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 #include <pcbnew.h>
 #include <class_board.h>
diff --git a/pcbnew/pcb_base_edit_frame.h b/pcbnew/pcb_base_edit_frame.h
index 12b46aa3ad..64ecbab79f 100644
--- a/pcbnew/pcb_base_edit_frame.h
+++ b/pcbnew/pcb_base_edit_frame.h
@@ -25,7 +25,7 @@
 #ifndef BASE_EDIT_FRAME_H
 #define BASE_EDIT_FRAME_H
 
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 class BOARD_ITEM_CONTAINER;
 
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index d557d3d8e9..36e6556e1b 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -30,12 +30,12 @@
 
 #include <fctsys.h>
 #include <kiface_i.h>
-#include <wxstruct.h>
+#include <eda_base_frame.h>
 #include <confirm.h>
 #include <kiface_i.h>
 #include <dialog_helpers.h>
 #include <kicad_device_context.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <base_units.h>
 #include <msgpanel.h>
 
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index 8ff0f5a079..9f1b020216 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -36,7 +36,7 @@
 #include <class_module.h>
 #include <class_track.h>
 #include <class_marker_pcb.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <confirm.h>
 
 #include <gal/graphics_abstraction_layer.h>
diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp
index 69cea587fd..d71ec2ac85 100644
--- a/pcbnew/plot_board_layers.cpp
+++ b/pcbnew/plot_board_layers.cpp
@@ -35,7 +35,7 @@
 #include <base_struct.h>
 #include <draw_graphic_text.h>
 #include <trigo.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index 549b9c8844..5b634e4c27 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -34,7 +34,7 @@
 #include <draw_graphic_text.h>
 #include <trigo.h>
 #include <macros.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/printout_controler.cpp b/pcbnew/printout_controler.cpp
index a77bd21ddf..4383f2bfc0 100644
--- a/pcbnew/printout_controler.cpp
+++ b/pcbnew/printout_controler.cpp
@@ -37,7 +37,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <base_units.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <class_board.h>
 #include <pcbnew.h>
 
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index 3629ef9abf..2129dce6c0 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index 7559836b8f..8cac0095dd 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxBasePcbFrame.h>
+#include <pcb_base_frame.h>
 #include <class_layer_box_selector.h>
 #include <class_board.h>
 #include <dialogs/dialog_layer_selection_base.h>