diff --git a/common/tool/tool_base.cpp b/common/tool/tool_base.cpp
index 6f531cf55e..d297e45292 100644
--- a/common/tool/tool_base.cpp
+++ b/common/tool/tool_base.cpp
@@ -25,7 +25,7 @@
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 
-#include <wxPcbStruct.h> // LAME!
+#include <pcb_edit_frame.h>
 
 bool TOOL_BASE::IsToolActive() const
 {
diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index fdecae8ec2..146ec2567f 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
-#include <pcb_base_frame.h>
+#include <pcb_edit_frame.h>
 
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 366e309d57..d8ace88358 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -41,7 +41,7 @@
 #include <tool/coroutine.h>
 #include <tool/action_manager.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 
 /// Struct describing the current execution state of a TOOL
diff --git a/common/tool/zoom_tool.cpp b/common/tool/zoom_tool.cpp
index 1180dde64e..98d5cc8416 100644
--- a/common/tool/zoom_tool.cpp
+++ b/common/tool/zoom_tool.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <view/view.h>
diff --git a/common/wx_status_popup.cpp b/common/wx_status_popup.cpp
index 9679b3e0da..307b77b578 100644
--- a/common/wx_status_popup.cpp
+++ b/common/wx_status_popup.cpp
@@ -27,7 +27,7 @@
  */
 
 #include <wx_status_popup.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 WX_STATUS_POPUP::WX_STATUS_POPUP( PCB_EDIT_FRAME* aParent ) :
     wxPopupWindow( aParent )
diff --git a/kicad/import_project.cpp b/kicad/import_project.cpp
index 1f394f4d11..ba582b4ae6 100644
--- a/kicad/import_project.cpp
+++ b/kicad/import_project.cpp
@@ -47,7 +47,7 @@
 
 #include <io_mgr.h>
 #include <sch_io_mgr.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <schframe.h>
 #include <netlist.h>
 
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 176628b680..db5870ab2d 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -250,7 +250,7 @@ set( PCBNEW_CLASS_SRCS
     modedit.cpp
     modedit_onclick.cpp
     modeditoptions.cpp
-    moduleframe.cpp
+    footprint_edit_frame.cpp
     modules.cpp
     modview_frame.cpp
     move-drag_pads.cpp
@@ -263,7 +263,7 @@ set( PCBNEW_CLASS_SRCS
     pcb_base_edit_frame.cpp
 #    pcb_draw_panel_gal.cpp
 #    pcb_view.cpp
-    pcbframe.cpp
+    pcb_edit_frame.cpp
     pcbnew_config.cpp
     pcbplot.cpp
     plot_board_layers.cpp
diff --git a/pcbnew/append_board_to_current.cpp b/pcbnew/append_board_to_current.cpp
index 60b4aee0ff..f29301c85c 100644
--- a/pcbnew/append_board_to_current.cpp
+++ b/pcbnew/append_board_to_current.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2004-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2014 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <properties.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <io_mgr.h>
 #include <class_module.h>
diff --git a/pcbnew/attribut.cpp b/pcbnew/attribut.cpp
index c56f09da24..f65afbe6b6 100644
--- a/pcbnew/attribut.cpp
+++ b/pcbnew/attribut.cpp
@@ -32,7 +32,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <gr_basic.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/autorouter/auto_place_footprints.cpp b/pcbnew/autorouter/auto_place_footprints.cpp
index 4b6b7ece75..289c9db36d 100644
--- a/pcbnew/autorouter/auto_place_footprints.cpp
+++ b/pcbnew/autorouter/auto_place_footprints.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <gr_basic.h>
 #include <macros.h>
 #include <msgpanel.h>
diff --git a/pcbnew/autorouter/spread_footprints.cpp b/pcbnew/autorouter/spread_footprints.cpp
index d23d5ea86b..9f826ace74 100644
--- a/pcbnew/autorouter/spread_footprints.cpp
+++ b/pcbnew/autorouter/spread_footprints.cpp
@@ -41,7 +41,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 
diff --git a/pcbnew/block.cpp b/pcbnew/block.cpp
index b71655e3bd..95378846c2 100644
--- a/pcbnew/block.cpp
+++ b/pcbnew/block.cpp
@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <block_commande.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 
 #include <class_board.h>
diff --git a/pcbnew/block_module_editor.cpp b/pcbnew/block_module_editor.cpp
index e1f1c0577b..e16b0be1e0 100644
--- a/pcbnew/block_module_editor.cpp
+++ b/pcbnew/block_module_editor.cpp
@@ -37,8 +37,7 @@
 #include <block_commande.h>
 #include <macros.h>
 
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <pcbplot.h>
 #include <trigo.h>
 
diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp
index 598f0adef4..57a5d62515 100644
--- a/pcbnew/board_commit.cpp
+++ b/pcbnew/board_commit.cpp
@@ -24,7 +24,7 @@
 
 #include <class_board.h>
 #include <class_module.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <tool/tool_manager.h>
 #include <ratsnest_data.h>
 #include <view/view.h>
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index 77136d2ece..fd3e763b07 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -35,7 +35,7 @@
 #include <fctsys.h>
 #include <draw_graphic_text.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <class_board.h>
 #include <class_pad.h>
diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp
index a31cb9c6d8..3aa670b9dd 100644
--- a/pcbnew/board_netlist_updater.cpp
+++ b/pcbnew/board_netlist_updater.cpp
@@ -46,7 +46,7 @@
 
 #include <board_netlist_updater.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 BOARD_NETLIST_UPDATER::BOARD_NETLIST_UPDATER( PCB_EDIT_FRAME* aFrame, BOARD* aBoard ) :
diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp
index dc7ccea9b9..99f11c80a2 100644
--- a/pcbnew/build_BOM_from_board.cpp
+++ b/pcbnew/build_BOM_from_board.cpp
@@ -30,7 +30,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <project.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/class_action_plugin.h b/pcbnew/class_action_plugin.h
index 2d3eeffd2f..53380a7a58 100644
--- a/pcbnew/class_action_plugin.h
+++ b/pcbnew/class_action_plugin.h
@@ -30,7 +30,7 @@
 #ifndef CLASS_ACTION_PLUGIN_H
 #define CLASS_ACTION_PLUGIN_H
 #include <vector>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 /**
  * Class ACTION_PLUGIN
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 043bbdb2cb..132824fc97 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -36,7 +36,7 @@
 #include <kicad_string.h>
 #include <richio.h>
 #include <bitmaps.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_pcb_text.h>
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index e62c855bf9..d38c29ca9c 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -39,7 +39,7 @@
 #include <msgpanel.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew.h>
 
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index 67c0175f84..da78be8b9b 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -44,7 +44,7 @@
 #include <base_units.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_edge_mod.h>
diff --git a/pcbnew/class_footprint_wizard.h b/pcbnew/class_footprint_wizard.h
index ef82f92282..eff7c65547 100644
--- a/pcbnew/class_footprint_wizard.h
+++ b/pcbnew/class_footprint_wizard.h
@@ -31,7 +31,7 @@
 #ifndef CLASS_FOOTPRINT_WIZARD_H
 #define CLASS_FOOTPRINT_WIZARD_H
 #include <vector>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 // Allowable parameter types for PCB wizards
 const wxString WIZARD_PARAM_UNITS_MM        = "mm";          // Millimetres
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index d4dad5c555..c201a0f5d1 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -43,7 +43,7 @@
 #include <msgpanel.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_edge_mod.h>
 #include <class_module.h>
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index 9a61b12b48..2e19e302c3 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -36,8 +36,7 @@
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>
-#include <pcb_base_frame.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew_id.h>             // ID_TRACK_BUTT
 #include <pcbnew.h>
 #include <class_board.h>
diff --git a/pcbnew/class_pcb_layer_box_selector.cpp b/pcbnew/class_pcb_layer_box_selector.cpp
index 08ebd9490d..3f7b69d782 100644
--- a/pcbnew/class_pcb_layer_box_selector.cpp
+++ b/pcbnew/class_pcb_layer_box_selector.cpp
@@ -30,7 +30,7 @@
  */
 #include <common.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
diff --git a/pcbnew/class_pcb_layer_widget.cpp b/pcbnew/class_pcb_layer_widget.cpp
index 9c175b795e..6ac09824ca 100644
--- a/pcbnew/class_pcb_layer_widget.cpp
+++ b/pcbnew/class_pcb_layer_widget.cpp
@@ -36,7 +36,7 @@
 #include <painter.h>
 
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <layer_widget.h>
 #include <macros.h>
diff --git a/pcbnew/class_pcb_target.cpp b/pcbnew/class_pcb_target.cpp
index e95eae8397..69f973a794 100644
--- a/pcbnew/class_pcb_target.cpp
+++ b/pcbnew/class_pcb_target.cpp
@@ -38,7 +38,7 @@
 #include <macros.h>
 #include <richio.h>
 #include <bitmaps.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_pcb_target.h>
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 4f3b557ffa..1603f91e70 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -37,7 +37,7 @@
 #include <richio.h>
 #include <class_drawpanel.h>
 #include <macros.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index fe77379f3b..da1b6b9c61 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -36,7 +36,7 @@
 #include <kicad_string.h>
 #include <richio.h>
 #include <macros.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>
diff --git a/pcbnew/clean.cpp b/pcbnew/clean.cpp
index eb4494c793..35349c9b3b 100644
--- a/pcbnew/clean.cpp
+++ b/pcbnew/clean.cpp
@@ -31,7 +31,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index 0dd214d023..8ae024a64f 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index 0f9474dc17..f833975763 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -14,7 +14,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <kiway_express.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <macros.h>
 
diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp
index 7733755c2e..3a394900c2 100644
--- a/pcbnew/deltrack.cpp
+++ b/pcbnew/deltrack.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <connectivity_data.h>
 
diff --git a/pcbnew/dialogs/dialog_block_options.cpp b/pcbnew/dialogs/dialog_block_options.cpp
index d6ce049b33..8d5ea00e3b 100644
--- a/pcbnew/dialogs/dialog_block_options.cpp
+++ b/pcbnew/dialogs/dialog_block_options.cpp
@@ -24,7 +24,7 @@
 
 #include <dialog_block_options.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 4749a037ca..f515a3fdc6 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <PolyLine.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <zones.h>
 #include <base_units.h>
 #include <widgets/text_ctrl_eval.h>
diff --git a/pcbnew/dialogs/dialog_create_array.cpp b/pcbnew/dialogs/dialog_create_array.cpp
index 2e8de48342..6ee6c9bb19 100644
--- a/pcbnew/dialogs/dialog_create_array.cpp
+++ b/pcbnew/dialogs/dialog_create_array.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <boost/algorithm/string/join.hpp>
diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp
index 61d0eade6f..d3929bdb95 100644
--- a/pcbnew/dialogs/dialog_design_rules.cpp
+++ b/pcbnew/dialogs/dialog_design_rules.cpp
@@ -35,7 +35,7 @@
 #include <base_units.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 
 #include <pcbnew_id.h>
diff --git a/pcbnew/dialogs/dialog_display_options.cpp b/pcbnew/dialogs/dialog_display_options.cpp
index 45274dcecc..b236134d8e 100644
--- a/pcbnew/dialogs/dialog_display_options.cpp
+++ b/pcbnew/dialogs/dialog_display_options.cpp
@@ -26,7 +26,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <config_map.h>
 
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index 7e6b2ad503..a76b21430d 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -33,7 +33,7 @@
 #include <wildcards_and_files_ext.h>
 #include <pgm_base.h>
 #include <dialog_drc.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <class_board_design_settings.h>
 #include <class_draw_panel_gal.h>
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
index 787cd87e45..3dd05665e4 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
@@ -38,7 +38,7 @@
 #include <pgm_base.h>
 #include <gestfich.h>
 #include <3d_viewer.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <project.h>
 #include <board_commit.h>
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index 7c7388c607..62b27a6110 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -38,7 +38,7 @@
 #include <kiface_i.h>
 #include <gestfich.h>
 #include <3d_viewer.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <validators.h>
@@ -49,7 +49,7 @@
 
 #include <class_module.h>
 #include <class_text_mod.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_edit_module_for_Modedit.h>
 #include <wildcards_and_files_ext.h>
 #include <pgm_base.h>
diff --git a/pcbnew/dialogs/dialog_exchange_modules.cpp b/pcbnew/dialogs/dialog_exchange_modules.cpp
index f71eb2977e..a1a47db8fe 100644
--- a/pcbnew/dialogs/dialog_exchange_modules.cpp
+++ b/pcbnew/dialogs/dialog_exchange_modules.cpp
@@ -29,7 +29,7 @@
 #include <class_draw_panel_gal.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <board_commit.h>
 #include <bitmaps.h>
diff --git a/pcbnew/dialogs/dialog_export_idf.cpp b/pcbnew/dialogs/dialog_export_idf.cpp
index d4080ec40e..9ffca3c712 100644
--- a/pcbnew/dialogs/dialog_export_idf.cpp
+++ b/pcbnew/dialogs/dialog_export_idf.cpp
@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kiface_i.h>
 #include <pcbnew.h>
 #include <class_board.h>
@@ -35,7 +35,7 @@
 
 // IDF export header generated by wxFormBuilder
 #include <dialog_export_idf_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #define OPTKEY_IDF_THOU wxT( "IDFExportThou" )
 #define OPTKEY_IDF_REF_AUTOADJ wxT( "IDFRefAutoAdj" )
diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp
index d909791e20..78f91d66d4 100644
--- a/pcbnew/dialogs/dialog_export_step.cpp
+++ b/pcbnew/dialogs/dialog_export_step.cpp
@@ -29,7 +29,7 @@
 #include <wx/choicdlg.h>
 #include <wx/stdpaths.h>
 
-#include "wxPcbStruct.h"
+#include "pcb_edit_frame.h"
 #include "kiface_i.h"
 #include "confirm.h"
 
diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp
index e853252ed7..4ac03e215a 100644
--- a/pcbnew/dialogs/dialog_export_vrml.cpp
+++ b/pcbnew/dialogs/dialog_export_vrml.cpp
@@ -29,7 +29,7 @@
 #include <wx/dir.h>
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kiface_i.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index 2d14577a67..b7bec2f898 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -28,7 +28,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
index 6bf4dab080..393fab1c18 100644
--- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
+++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
@@ -33,7 +33,7 @@
 #include <wildcards_and_files_ext.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <class_board.h>
 
diff --git a/pcbnew/dialogs/dialog_gencad_export_options.cpp b/pcbnew/dialogs/dialog_gencad_export_options.cpp
index 2a5842a6f0..66bfbf1f50 100644
--- a/pcbnew/dialogs/dialog_gencad_export_options.cpp
+++ b/pcbnew/dialogs/dialog_gencad_export_options.cpp
@@ -24,7 +24,7 @@
 
 #include "dialog_gencad_export_options.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <project.h>
 #include <confirm.h>
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 3cfaa8ad18..5f5b79a848 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -30,7 +30,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <gendrill_Excellon_writer.h>
 #include <gendrill_gerber_writer.h>
diff --git a/pcbnew/dialogs/dialog_general_options.cpp b/pcbnew/dialogs/dialog_general_options.cpp
index 151fadd701..fc1946d7c2 100644
--- a/pcbnew/dialogs/dialog_general_options.cpp
+++ b/pcbnew/dialogs/dialog_general_options.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <kicad_string.h>
 #include <pcbnew_id.h>
diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp
index c85eb92039..35b62ecdc5 100644
--- a/pcbnew/dialogs/dialog_global_deletion.cpp
+++ b/pcbnew/dialogs/dialog_global_deletion.cpp
@@ -28,7 +28,7 @@ using namespace std::placeholders;
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <ratsnest_data.h>
 #include <board_commit.h>
 
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index c597c09179..07f440eb3c 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -25,7 +25,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_drawpanel.h>
 #include <base_units.h>
 
diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
index 77eaadee30..0e7db1fa5d 100644
--- a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
+++ b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp
@@ -37,7 +37,7 @@
 #include <board_commit.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/dialogs/dialog_global_pads_edition.cpp b/pcbnew/dialogs/dialog_global_pads_edition.cpp
index c2c449b5de..e63a5de7b3 100644
--- a/pcbnew/dialogs/dialog_global_pads_edition.cpp
+++ b/pcbnew/dialogs/dialog_global_pads_edition.cpp
@@ -25,7 +25,7 @@
 #include <dialog_global_pads_edition.h>
 
 #include <class_pad.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 DIALOG_GLOBAL_PADS_EDITION::DIALOG_GLOBAL_PADS_EDITION( PCB_BASE_FRAME* aParent, D_PAD* aPad ) :
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 4d5641d4bd..e429905715 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -41,7 +41,7 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 #include <wx/valnum.h>
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
index 6083171acf..5bf9d2776a 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
@@ -38,9 +38,9 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <base_units.h>
 #include <wx/valnum.h>
 #include <board_commit.h>
diff --git a/pcbnew/dialogs/dialog_graphic_items_options.cpp b/pcbnew/dialogs/dialog_graphic_items_options.cpp
index 28fbb3f95a..7c384f7f45 100644
--- a/pcbnew/dialogs/dialog_graphic_items_options.cpp
+++ b/pcbnew/dialogs/dialog_graphic_items_options.cpp
@@ -25,11 +25,11 @@
 #include <fctsys.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <pcbnew_id.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <class_board.h>
 #include <widgets/text_ctrl_eval.h>
 
diff --git a/pcbnew/dialogs/dialog_keepout_area_properties.cpp b/pcbnew/dialogs/dialog_keepout_area_properties.cpp
index a29be6fd99..0d042c45a9 100644
--- a/pcbnew/dialogs/dialog_keepout_area_properties.cpp
+++ b/pcbnew/dialogs/dialog_keepout_area_properties.cpp
@@ -32,7 +32,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_zone.h>
 #include <zones.h>
 #include <base_units.h>
diff --git a/pcbnew/dialogs/dialog_mask_clearance.cpp b/pcbnew/dialogs/dialog_mask_clearance.cpp
index 1b18fc0012..e3d3ea8fd4 100644
--- a/pcbnew/dialogs/dialog_mask_clearance.cpp
+++ b/pcbnew/dialogs/dialog_mask_clearance.cpp
@@ -26,7 +26,7 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 
diff --git a/pcbnew/dialogs/dialog_modedit_display_options.cpp b/pcbnew/dialogs/dialog_modedit_display_options.cpp
index dc85a45ad2..b57de67abe 100644
--- a/pcbnew/dialogs/dialog_modedit_display_options.cpp
+++ b/pcbnew/dialogs/dialog_modedit_display_options.cpp
@@ -20,7 +20,7 @@
 #include <dialog_modedit_display_options.h>
 
 #include <class_drawpanel.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <view/view.h>
 
diff --git a/pcbnew/dialogs/dialog_modedit_options.cpp b/pcbnew/dialogs/dialog_modedit_options.cpp
index f85f8532a3..12b574e4db 100644
--- a/pcbnew/dialogs/dialog_modedit_options.cpp
+++ b/pcbnew/dialogs/dialog_modedit_options.cpp
@@ -26,12 +26,12 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 #include <widgets/text_ctrl_eval.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <dialog_modedit_options_base.h>
 
diff --git a/pcbnew/dialogs/dialog_move_exact.cpp b/pcbnew/dialogs/dialog_move_exact.cpp
index b22c1685c9..0c8ede4f35 100644
--- a/pcbnew/dialogs/dialog_move_exact.cpp
+++ b/pcbnew/dialogs/dialog_move_exact.cpp
@@ -23,11 +23,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <widgets/text_ctrl_eval.h>
 
 #include "dialog_move_exact.h"
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 73a368a91c..c21f14fb74 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -34,7 +34,7 @@
 #include <dialog_helpers.h>
 #include <html_messagebox.h>
 #include <base_units.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_netlist.h>
 #include <netlist_reader.h>
 #include <reporter.h>
diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
index fdf827b831..2f286930dd 100644
--- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
+++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.cpp b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
index 6b7520790c..31e552bbcb 100644
--- a/pcbnew/dialogs/dialog_pcb_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
@@ -30,7 +30,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <draw_graphic_text.h>
 #include <confirm.h>
 #include <base_units.h>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 14857bfc8a..c5650a74fb 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -29,7 +29,7 @@
 #include <kiface_i.h>
 #include <plotter.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <gerber_jobfile_writer.h>
 #include <base_units.h>
diff --git a/pcbnew/dialogs/dialog_position_relative.cpp b/pcbnew/dialogs/dialog_position_relative.cpp
index fd1e614bc5..94693b335e 100644
--- a/pcbnew/dialogs/dialog_position_relative.cpp
+++ b/pcbnew/dialogs/dialog_position_relative.cpp
@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <widgets/text_ctrl_eval.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include "dialog_position_relative.h"
 #include "tools/pcb_actions.h"
diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp
index 9f4194881c..c57aa3ab8c 100644
--- a/pcbnew/dialogs/dialog_print_for_modedit.cpp
+++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp
@@ -29,8 +29,8 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <pcb_edit_frame.h>
+#include <footprint_edit_frame.h>
 #include <pcbplot.h>
 
 #include <dialog_print_for_modedit_base.h>
diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp
index 7edd57339e..c827b9260a 100644
--- a/pcbnew/dialogs/dialog_print_using_printer.cpp
+++ b/pcbnew/dialogs/dialog_print_using_printer.cpp
@@ -29,7 +29,7 @@
 #include <kiface_i.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <printout_controler.h>
diff --git a/pcbnew/dialogs/dialog_scripting.cpp b/pcbnew/dialogs/dialog_scripting.cpp
index 3ae282b1f7..350ca933c0 100644
--- a/pcbnew/dialogs/dialog_scripting.cpp
+++ b/pcbnew/dialogs/dialog_scripting.cpp
@@ -30,7 +30,7 @@
 #include <Python.h>
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_scripting.h>
 
 
diff --git a/pcbnew/dialogs/dialog_select_net_from_list.cpp b/pcbnew/dialogs/dialog_select_net_from_list.cpp
index ae0e7fb1e5..c9044f07d7 100644
--- a/pcbnew/dialogs/dialog_select_net_from_list.cpp
+++ b/pcbnew/dialogs/dialog_select_net_from_list.cpp
@@ -34,7 +34,7 @@
 #include <kicad_device_context.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <dialog_select_net_from_list_base.h>
 #include <eda_pattern_match.h>
diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp
index 846d10cdc3..59e1677f23 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties.cpp
@@ -26,7 +26,7 @@
 #include <class_pcb_layer_box_selector.h>
 #include <tools/selection_tool.h>
 #include <class_track.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <confirm.h>
 #include <widgets/text_ctrl_eval.h>
 
diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index ea10825be2..9dddb61081 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/pcbnew/dialogs/dialog_update_pcb.cpp
@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_netlist.h>
 #include <dialog_update_pcb.h>
 #include <wx_html_report_panel.h>
diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp
index 8201b807d1..7892187d3a 100644
--- a/pcbnew/dimension.cpp
+++ b/pcbnew/dimension.cpp
@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <draw_graphic_text.h>
 #include <dialog_helpers.h>
 #include <macros.h>
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index c199e5b89d..101611793b 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <class_board_design_settings.h>
diff --git a/pcbnew/drc_clearance_test_functions.cpp b/pcbnew/drc_clearance_test_functions.cpp
index a481e51fa5..2288cd30d0 100644
--- a/pcbnew/drc_clearance_test_functions.cpp
+++ b/pcbnew/drc_clearance_test_functions.cpp
@@ -32,7 +32,7 @@
  */
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/edgemod.cpp b/pcbnew/edgemod.cpp
index b061d750fe..e105370f75 100644
--- a/pcbnew/edgemod.cpp
+++ b/pcbnew/edgemod.cpp
@@ -36,10 +36,10 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_edge_mod.h>
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index c0220364eb..9c513a2ad3 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -37,11 +37,11 @@
 #include <eda_doc.h>
 #include <gestfich.h>
 #include <kicad_device_context.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew_id.h>
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp
index f793e3e8b3..bbbadff33a 100644
--- a/pcbnew/edit_pcb_text.cpp
+++ b/pcbnew/edit_pcb_text.cpp
@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index 2d6ecc562b..28c7f9e438 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/editedge.cpp b/pcbnew/editedge.cpp
index 18b3ad9db6..4e0a1cf253 100644
--- a/pcbnew/editedge.cpp
+++ b/pcbnew/editedge.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <gr_basic.h>
 
 #include <pcbnew.h>
diff --git a/pcbnew/editmod.cpp b/pcbnew/editmod.cpp
index db432e66e3..1caea113e8 100644
--- a/pcbnew/editmod.cpp
+++ b/pcbnew/editmod.cpp
@@ -32,8 +32,8 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <pcb_edit_frame.h>
+#include <footprint_edit_frame.h>
 #include <3d_viewer/eda_3d_viewer.h>
 
 #include <class_module.h>
diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp
index 209deedcf0..c51f741bcf 100644
--- a/pcbnew/editrack-part2.cpp
+++ b/pcbnew/editrack-part2.cpp
@@ -33,7 +33,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp
index 5b94bbbb5f..3d16841d49 100644
--- a/pcbnew/editrack.cpp
+++ b/pcbnew/editrack.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew.h>
 #include <drc.h>
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index 21904a48e9..e0310fcdcf 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -37,8 +37,8 @@
 #include <macros.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <pcb_edit_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/event_handlers_tracks_vias_sizes.cpp b/pcbnew/event_handlers_tracks_vias_sizes.cpp
index 3361f4b790..98ed3a730b 100644
--- a/pcbnew/event_handlers_tracks_vias_sizes.cpp
+++ b/pcbnew/event_handlers_tracks_vias_sizes.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 
 #include <pcbnew_id.h>
diff --git a/pcbnew/exporters/export_d356.cpp b/pcbnew/exporters/export_d356.cpp
index bc08af95ba..8088790280 100644
--- a/pcbnew/exporters/export_d356.cpp
+++ b/pcbnew/exporters/export_d356.cpp
@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <kiface_i.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <build_version.h>
 #include <macros.h>
diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
index 64844c80a0..0db934cc1d 100644
--- a/pcbnew/exporters/export_gencad.cpp
+++ b/pcbnew/exporters/export_gencad.cpp
@@ -34,7 +34,7 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <build_version.h>
 #include <macros.h>
diff --git a/pcbnew/exporters/export_idf.cpp b/pcbnew/exporters/export_idf.cpp
index ea44fbfcec..647218e2a2 100644
--- a/pcbnew/exporters/export_idf.cpp
+++ b/pcbnew/exporters/export_idf.cpp
@@ -27,7 +27,7 @@
 
 
 #include <list>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <pcbnew.h>
 #include <class_board.h>
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 1b4177035f..4ae567e707 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -46,7 +46,7 @@
 #include "plugins/3dapi/ifsg_all.h"
 #include "streamwrapper.h"
 #include "vrml_layer.h"
-#include "wxPcbStruct.h"
+#include "pcb_edit_frame.h"
 #include "../../kicad/kicad.h"
 
 #include <zone_filler.h>
diff --git a/pcbnew/exporters/gen_modules_placefile.cpp b/pcbnew/exporters/gen_modules_placefile.cpp
index 0c195e9a2f..7af1f60102 100644
--- a/pcbnew/exporters/gen_modules_placefile.cpp
+++ b/pcbnew/exporters/gen_modules_placefile.cpp
@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 #include <macros.h>
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
index b278542161..e645b32d3e 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@@ -39,7 +39,7 @@
 
 #include <plotter.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index d46f8d7913..4397d004d3 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -33,7 +33,7 @@
 
 #include <plotter.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 
diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp
index cbec57996c..78247d2ad0 100644
--- a/pcbnew/exporters/gerber_jobfile_writer.cpp
+++ b/pcbnew/exporters/gerber_jobfile_writer.cpp
@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <plotter.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <build_version.h>
 
 #include <class_board.h>
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index cb719cb449..a92e13e4ae 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <richio.h>
@@ -52,8 +52,6 @@
 
 #include <class_board.h>
 #include <build_version.h>      // LEGACY_BOARD_FILE_VERSION
-#include <module_editor_frame.h>
-#include <modview_frame.h>
 
 #include <wx/stdpaths.h>
 
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 0ed3507a29..51097f402e 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <pcb_draw_panel_gal.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
@@ -50,7 +50,7 @@
 #include <hotkeys.h>
 #include <dialogs/dialog_modedit_display_options.h>
 #include <dialog_hotkeys_editor.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <modview_frame.h>
 #include <wildcards_and_files_ext.h>
 #include <class_pcb_layer_widget.h>
diff --git a/pcbnew/footprint_edit_frame.h b/pcbnew/footprint_edit_frame.h
index 1ebbdc9edb..fac950c091 100644
--- a/pcbnew/footprint_edit_frame.h
+++ b/pcbnew/footprint_edit_frame.h
@@ -18,12 +18,12 @@
  */
 
 /**
- * @file module_editor_frame.h
+ * @file footprint_edit_frame.h
  * @brief Definition of class FOOTPRINT_EDIT_FRAME.
  */
 
-#ifndef MODULE_EDITOR_FRAME_H_
-#define MODULE_EDITOR_FRAME_H_
+#ifndef FOOTPRINT_EDIT_FRAME_H
+#define FOOTPRINT_EDIT_FRAME_H
 
 #include <pcb_base_frame.h>
 #include <pcb_base_edit_frame.h>
@@ -535,4 +535,4 @@ private:
     void duplicateItems( bool aIncrement ) override;
 };
 
-#endif      // MODULE_EDITOR_FRAME_H_
+#endif      // FOOTPRINT_EDIT_FRAME_H
diff --git a/pcbnew/footprint_wizard.cpp b/pcbnew/footprint_wizard.cpp
index 2411f700e9..7fec808dfc 100644
--- a/pcbnew/footprint_wizard.cpp
+++ b/pcbnew/footprint_wizard.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 
 #include <class_board.h>
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index dd5453dd2a..d5f322825a 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <miguelangel@nbee.es>
  * Copyright (C) 2012-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008-2015 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
@@ -40,7 +40,7 @@
 
 #include <class_board.h>
 #include <class_module.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <pcbnew_id.h>
 #include "footprint_wizard_frame.h"
diff --git a/pcbnew/globaleditpad.cpp b/pcbnew/globaleditpad.cpp
index 5d109fde1a..36d518d14e 100644
--- a/pcbnew/globaleditpad.cpp
+++ b/pcbnew/globaleditpad.cpp
@@ -30,8 +30,8 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <pcb_edit_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/highlight.cpp b/pcbnew/highlight.cpp
index 2679a45941..03610c9621 100644
--- a/pcbnew/highlight.cpp
+++ b/pcbnew/highlight.cpp
@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kicad_device_context.h>
 
 #include <class_board.h>
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index b80089976e..e004303ad6 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -28,7 +28,7 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <modview_frame.h>
 #include <pcbnew_id.h>
 
diff --git a/pcbnew/hotkeys_board_editor.cpp b/pcbnew/hotkeys_board_editor.cpp
index ea41f05d03..160017b3bd 100644
--- a/pcbnew/hotkeys_board_editor.cpp
+++ b/pcbnew/hotkeys_board_editor.cpp
@@ -27,7 +27,7 @@
  */
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 
diff --git a/pcbnew/hotkeys_module_editor.cpp b/pcbnew/hotkeys_module_editor.cpp
index 1713e1bccf..d8de679b31 100644
--- a/pcbnew/hotkeys_module_editor.cpp
+++ b/pcbnew/hotkeys_module_editor.cpp
@@ -28,8 +28,7 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <pcbnew_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
diff --git a/pcbnew/import_dxf/dialog_dxf_import.h b/pcbnew/import_dxf/dialog_dxf_import.h
index 899cf8d541..32b52d1118 100644
--- a/pcbnew/import_dxf/dialog_dxf_import.h
+++ b/pcbnew/import_dxf/dialog_dxf_import.h
@@ -23,7 +23,7 @@
  */
 
 #include <dialog_dxf_import_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dxf2brd_items.h>
 
 class DIALOG_DXF_IMPORT : public DIALOG_DXF_IMPORT_BASE
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index 11fe793394..bcfeb5f7ef 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -28,12 +28,12 @@
 
 #include <fctsys.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 
 bool PCB_EDIT_FRAME::Clear_Pcb( bool aQuery )
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 7d8a48ce84..b75162ef02 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -36,7 +36,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <filter_reader.h>
 #include <macros.h>
@@ -47,7 +47,7 @@
 #include <class_module.h>
 
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <wildcards_and_files_ext.h>
 #include <kicad_plugin.h>
 #include <legacy_plugin.h>
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index 4edef4426c..60e6844163 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -39,7 +39,7 @@ using namespace std::placeholders;
 #include <kicad_string.h>
 #include <pgm_base.h>
 #include <kiway.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <filter_reader.h>
 #include <gr_basic.h>
@@ -52,7 +52,7 @@ using namespace std::placeholders;
 #include <io_mgr.h>
 
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <footprint_info.h>
 #include <footprint_info_impl.h>
 #include <dialog_get_component.h>
diff --git a/pcbnew/magnetic_tracks_functions.cpp b/pcbnew/magnetic_tracks_functions.cpp
index 6d7548990e..cad4314a21 100644
--- a/pcbnew/magnetic_tracks_functions.cpp
+++ b/pcbnew/magnetic_tracks_functions.cpp
@@ -34,7 +34,7 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index 28be8dc8c8..e0302a25b6 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -32,12 +32,10 @@
 
 #include <menus_helpers.h>
 #include <pgm_base.h>
-#include <wxPcbStruct.h>
-
 
 #include "help_common_strings.h"
 #include "hotkeys.h"
-#include "module_editor_frame.h"
+#include "footprint_edit_frame.h"
 #include "pcbnew.h"
 #include "pcbnew_id.h"
 
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index 36032d9ab1..2188ec2c80 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -26,14 +26,14 @@
 
 /**
  * @file menubar_pcbframe.cpp
- * Pcbnew editor menu bar
+ * board editor menubars
  */
 
 
 #include <menus_helpers.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include "help_common_strings.h"
 #include "hotkeys.h"
diff --git a/pcbnew/microwave.cpp b/pcbnew/microwave.cpp
index 6a69a4e81b..7c16d2db98 100644
--- a/pcbnew/microwave.cpp
+++ b/pcbnew/microwave.cpp
@@ -35,7 +35,7 @@
 #include <trigo.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <richio.h>
 #include <filter_reader.h>
diff --git a/pcbnew/microwave/microwave_inductor.cpp b/pcbnew/microwave/microwave_inductor.cpp
index dae59713cc..7239ca8886 100644
--- a/pcbnew/microwave/microwave_inductor.cpp
+++ b/pcbnew/microwave/microwave_inductor.cpp
@@ -27,7 +27,7 @@
 
 #include <base_units.h>
 #include <validators.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_pad.h>
 #include <class_edge_mod.h>
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index f637862ebf..d317930b04 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -36,7 +36,6 @@
 #include <pgm_base.h>
 #include <trigo.h>
 #include <3d_viewer/eda_3d_viewer.h>
-#include <wxPcbStruct.h>
 #include <kicad_device_context.h>
 #include <macros.h>
 #include <invoke_pcb_dialog.h>
@@ -51,7 +50,7 @@
 #include <pcbnew.h>
 #include <protos.h>
 #include <pcbnew_id.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <modview_frame.h>
 #include <collectors.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp
index 07cbd4aa46..fe8f46232b 100644
--- a/pcbnew/modedit_onclick.cpp
+++ b/pcbnew/modedit_onclick.cpp
@@ -29,7 +29,6 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
 #include <gr_basic.h>
 
 #include <class_board.h>
@@ -41,7 +40,7 @@
 #include <pcbnew_id.h>
 #include <tools/pcbnew_control.h>
 #include <hotkeys.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_edit_module_for_Modedit.h>
 #include <menus_helpers.h>
 
diff --git a/pcbnew/modeditoptions.cpp b/pcbnew/modeditoptions.cpp
index aec6c26134..2e18c05c23 100644
--- a/pcbnew/modeditoptions.cpp
+++ b/pcbnew/modeditoptions.cpp
@@ -26,15 +26,14 @@
 
 /**
  * @file modeditoptions.cpp
- * @brief Pcbnew footprint (module) editor options.
+ * @brief Pcbnew footprint editor options.
  */
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp
index 9c52020064..b52abae79c 100644
--- a/pcbnew/modules.cpp
+++ b/pcbnew/modules.cpp
@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <macros.h>
 
diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp
index 3d9d598089..bf00306fec 100644
--- a/pcbnew/modview_frame.cpp
+++ b/pcbnew/modview_frame.cpp
@@ -32,7 +32,6 @@
 #include <kiway.h>
 #include <class_drawpanel.h>
 #include <pcb_draw_panel_gal.h>
-#include <wxPcbStruct.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <dialog_helpers.h>
 #include <msgpanel.h>
diff --git a/pcbnew/modview_frame.h b/pcbnew/modview_frame.h
index bb6abcbc50..2fc17b951d 100644
--- a/pcbnew/modview_frame.h
+++ b/pcbnew/modview_frame.h
@@ -31,10 +31,12 @@
 
 
 #include <wx/gdicmn.h>
+#include <pcb_base_frame.h>
 
 class wxSashLayoutWindow;
 class wxListBox;
 class FP_LIB_TABLE;
+class BOARD_ITEM;
 
 namespace PCB { struct IFACE; }
 
diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp
index 35a0b60e62..7b513a9ca8 100644
--- a/pcbnew/move_or_drag_track.cpp
+++ b/pcbnew/move_or_drag_track.cpp
@@ -32,7 +32,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <macros.h>
 #include <gr_basic.h>
diff --git a/pcbnew/muwave_command.cpp b/pcbnew/muwave_command.cpp
index ececfd131a..a02e42c296 100644
--- a/pcbnew/muwave_command.cpp
+++ b/pcbnew/muwave_command.cpp
@@ -26,7 +26,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew_id.h>
 #include <kicad_device_context.h>
diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp
index 22976ba51f..8078f6bd4b 100644
--- a/pcbnew/netlist.cpp
+++ b/pcbnew/netlist.cpp
@@ -36,7 +36,7 @@ using namespace std::placeholders;
 #include <class_draw_panel_gal.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_netlist.h>
 #include <netlist_reader.h>
 #include <reporter.h>
diff --git a/pcbnew/onleftclick.cpp b/pcbnew/onleftclick.cpp
index 9aeb2ae87b..9493b523a4 100644
--- a/pcbnew/onleftclick.cpp
+++ b/pcbnew/onleftclick.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 
 #include <class_board.h>
diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp
index cbc47ff747..2857dc248d 100644
--- a/pcbnew/onrightclick.cpp
+++ b/pcbnew/onrightclick.cpp
@@ -42,7 +42,7 @@
 #include <class_zone.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
 #include <hotkeys.h>
 #include <collectors.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index d3b80a8473..802eacc232 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file pcbframe.cpp
+ * @file pcb_edit_frame.cpp
  * @brief PCB editor main window implementation.
  */
 
@@ -30,7 +30,7 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <collectors.h>
 #include <build_version.h>
 #include <macros.h>
@@ -47,7 +47,7 @@
 #include <class_pcb_layer_widget.h>
 #include <hotkeys.h>
 #include <config_params.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_helpers.h>
 #include <dialog_plot.h>
 #include <dialog_exchange_modules.h>
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index be5a4c9992..c438a00e45 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -40,7 +40,7 @@
 #include <macros.h>
 #include <make_unique.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <wx/stdpaths.h>
 
@@ -55,12 +55,13 @@
 #include <class_board.h>
 #include <class_draw_panel_gal.h>
 #include <fp_lib_table.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <modview_frame.h>
 #include <footprint_wizard_frame.h>
 #include <footprint_preview_panel.h>
 #include <footprint_info_impl.h>
 #include <gl_context_mgr.h>
+
 extern bool IsWxPythonLoaded();
 
 // Colors for layers and items
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index 197354754c..c9f073dbe2 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -38,7 +38,7 @@
 #include <xnode.h>
 #include <common.h>
 #include <macros.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <plotter.h>
 #include <worksheet.h>
@@ -52,7 +52,6 @@
 #include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <hotkeys.h>
-#include <module_editor_frame.h>
 #include <modview_frame.h>
 
 #include <invoke_pcb_dialog.h>
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index cf1b406cac..bc453caea2 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <plotter.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <base_units.h>
 #include <reporter.h>
diff --git a/pcbnew/print_board_functions.cpp b/pcbnew/print_board_functions.cpp
index cbc9ffe69f..664c04135a 100644
--- a/pcbnew/print_board_functions.cpp
+++ b/pcbnew/print_board_functions.cpp
@@ -27,7 +27,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <printout_controler.h>
 #include <class_board.h>
 #include <class_module.h>
@@ -37,7 +37,7 @@
 
 #include <pcbnew.h>
 #include <pcbplot.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 
 static void Print_Module( EDA_DRAW_PANEL* aPanel, wxDC* aDC, MODULE* aModule,
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index 2129dce6c0..4e33ee235b 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 <pcb_base_frame.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
@@ -43,8 +43,6 @@
 #include <connectivity_data.h>
 #include <ratsnest_data.h>
 
-#include <wxPcbStruct.h>
-
 /**
  * Function Compile_Ratsnest
  *  Create the entire board ratsnest.
diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp
index 2841f2e197..6e3ae18aba 100644
--- a/pcbnew/router/length_tuner_tool.cpp
+++ b/pcbnew/router/length_tuner_tool.cpp
@@ -24,7 +24,7 @@
 #include "class_draw_panel_gal.h"
 #include "class_board.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
 #include <view/view_controls.h>
 #include <pcb_painter.h>
diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 8db250f2d2..c86b8dda84 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -27,7 +27,7 @@
 #include <board_commit.h>
 #include <layers_id_colors_and_visibility.h>
 #include <geometry/convex_hull.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <unordered_set>
 #include <unordered_map>
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index 6f0bf61f24..df2c0601fa 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -27,7 +27,7 @@ using namespace std::placeholders;
 #include "class_draw_panel_gal.h"
 #include "class_board.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <id.h>
 #include <macros.h>
 #include <pcbnew_id.h>
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index d2b07348b4..a2a1a8a86a 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -28,7 +28,7 @@ using namespace std::placeholders;
 #include "class_draw_panel_gal.h"
 #include "class_board.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <id.h>
 #include <macros.h>
 #include <pcbnew_id.h>
diff --git a/pcbnew/specctra_import_export/specctra_export.cpp b/pcbnew/specctra_import_export/specctra_export.cpp
index 1e40da8037..363c820382 100644
--- a/pcbnew/specctra_import_export/specctra_export.cpp
+++ b/pcbnew/specctra_import_export/specctra_export.cpp
@@ -31,7 +31,7 @@
     Also see the comments at the top of the specctra.cpp file itself.
 */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <confirm.h>            // DisplayError()
 #include <gestfich.h>           // EDA_FileSelector()
 #include <trigo.h>              // RotatePoint()
@@ -71,7 +71,7 @@ using namespace DSN;
 static const double safetyMargin = 0.1;
 
 
-// see wxPcbStruct.h
+// see pcb_edit_frame.h
 void PCB_EDIT_FRAME::ExportToSpecctra( wxCommandEvent& event )
 {
     wxString    fullFileName;
diff --git a/pcbnew/specctra_import_export/specctra_import.cpp b/pcbnew/specctra_import_export/specctra_import.cpp
index 3170edc86a..95135c13bb 100644
--- a/pcbnew/specctra_import_export/specctra_import.cpp
+++ b/pcbnew/specctra_import_export/specctra_import.cpp
@@ -35,7 +35,7 @@
 #include <class_drawpanel.h>    // m_canvas
 #include <confirm.h>            // DisplayError()
 #include <gestfich.h>           // EDA_FileSelector()
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/swap_layers.cpp b/pcbnew/swap_layers.cpp
index 4b91f31f42..b1e5dc990d 100644
--- a/pcbnew/swap_layers.cpp
+++ b/pcbnew/swap_layers.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_shim.h>
 
 #include <class_board.h>
diff --git a/pcbnew/target_edit.cpp b/pcbnew/target_edit.cpp
index a34ff25b82..91a92b64fb 100644
--- a/pcbnew/target_edit.cpp
+++ b/pcbnew/target_edit.cpp
@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <base_units.h>
 #include <gr_basic.h>
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index d76bda4ba0..a0865f648b 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -28,8 +28,7 @@
 #include <fctsys.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_helpers.h>
 #include <pcbnew_id.h>
 #include <hotkeys.h>
diff --git a/pcbnew/tool_modview.cpp b/pcbnew/tool_modview.cpp
index 2441cbbb19..fb879c3279 100644
--- a/pcbnew/tool_modview.cpp
+++ b/pcbnew/tool_modview.cpp
@@ -29,7 +29,6 @@
 #include <dialog_helpers.h>
 #include <macros.h>
 #include <menus_helpers.h>
-#include <wxPcbStruct.h>
 
 #include "help_common_strings.h"
 #include "hotkeys.h"
diff --git a/pcbnew/tool_onrightclick.cpp b/pcbnew/tool_onrightclick.cpp
index 969eda5cf7..6c9a639958 100644
--- a/pcbnew/tool_onrightclick.cpp
+++ b/pcbnew/tool_onrightclick.cpp
@@ -30,8 +30,8 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
-#include <module_editor_frame.h>
+#include <pcb_edit_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_design_rules.h>
 #include <pcbnew_id.h>
 
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index 51f4d1813f..4c83051b28 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -34,7 +34,7 @@
 #include <help_common_strings.h>
 #include <dialog_helpers.h>
 #include <class_layer_box_selector.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <bitmaps.h>
diff --git a/pcbnew/toolbars_update_user_interface.cpp b/pcbnew/toolbars_update_user_interface.cpp
index 9ef8f7f52e..6ee34136ed 100644
--- a/pcbnew/toolbars_update_user_interface.cpp
+++ b/pcbnew/toolbars_update_user_interface.cpp
@@ -32,7 +32,7 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <class_board.h>
 #include <pcbnew.h>
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 38f04ca09a..6fc891475c 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -26,7 +26,7 @@
 #include "drawing_tool.h"
 #include "pcb_actions.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 #include <project.h>
 #include <id.h>
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index d6dae64428..ed9e34cbc7 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -31,10 +31,10 @@
 #include <class_edge_mod.h>
 #include <class_zone.h>
 #include <collectors.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kiway.h>
 #include <class_draw_panel_gal.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <array_creator.h>
 #include <pcbnew_id.h>
 
diff --git a/pcbnew/tools/grid_helper.cpp b/pcbnew/tools/grid_helper.cpp
index d1af3db74c..b4e20ef04c 100644
--- a/pcbnew/tools/grid_helper.cpp
+++ b/pcbnew/tools/grid_helper.cpp
@@ -25,7 +25,7 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/tools/module_editor_tools.cpp b/pcbnew/tools/module_editor_tools.cpp
index 626bbc9665..33199c2ec2 100644
--- a/pcbnew/tools/module_editor_tools.cpp
+++ b/pcbnew/tools/module_editor_tools.cpp
@@ -45,7 +45,7 @@
 #include <hotkeys.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_edge_mod.h>
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index 7ce4e61c4e..c79996376b 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -24,7 +24,7 @@
 
 #include "pad_tool.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <view/view.h>
diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp
index f96c054bdf..454802ec49 100644
--- a/pcbnew/tools/pcb_editor_control.cpp
+++ b/pcbnew/tools/pcb_editor_control.cpp
@@ -39,7 +39,7 @@
 #include <painter.h>
 #include <project.h>
 #include <pcbnew_id.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_zone.h>
 #include <pcb_draw_panel_gal.h>
diff --git a/pcbnew/tools/pcb_tool.h b/pcbnew/tools/pcb_tool.h
index b00ea8b711..64f5c90f9b 100644
--- a/pcbnew/tools/pcb_tool.h
+++ b/pcbnew/tools/pcb_tool.h
@@ -29,7 +29,7 @@
 
 #include <tool/tool_event.h>
 #include <tool/tool_interactive.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <view/view_group.h>
 #include <pcb_view.h>
diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp
index 6d5c993666..b8bc07ead4 100644
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@@ -46,7 +46,7 @@
 #include <kicad_clipboard.h>
 
 #include <pcbnew_id.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_draw_panel_gal.h>
 #include <connectivity_data.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/tools/picker_tool.cpp b/pcbnew/tools/picker_tool.cpp
index 9bf7151295..79b5913030 100644
--- a/pcbnew/tools/picker_tool.cpp
+++ b/pcbnew/tools/picker_tool.cpp
@@ -26,7 +26,7 @@
 #include "pcb_actions.h"
 #include "grid_helper.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <view/view_controls.h>
 #include <tool/tool_manager.h>
 
diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp
index 010afb2ea9..76fe66efec 100644
--- a/pcbnew/tools/placement_tool.cpp
+++ b/pcbnew/tools/placement_tool.cpp
@@ -27,7 +27,7 @@
 #include "selection_tool.h"
 #include <tool/tool_manager.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <ratsnest_data.h>
 #include <board_commit.h>
diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp
index 4dad1dd595..2b5acf4a87 100644
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@@ -37,7 +37,7 @@ using namespace std::placeholders;
 #include <board_commit.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_edge_mod.h>
 #include <class_dimension.h>
 #include <class_zone.h>
diff --git a/pcbnew/tools/selection.cpp b/pcbnew/tools/selection.cpp
index 0906a40c74..af33912562 100644
--- a/pcbnew/tools/selection.cpp
+++ b/pcbnew/tools/selection.cpp
@@ -37,7 +37,7 @@ using namespace std::placeholders;
 #include <class_drawsegment.h>
 #include <class_zone.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index 8c760f6b09..72d0fa7324 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -36,7 +36,7 @@ using namespace std::placeholders;
 #include <class_drawsegment.h>
 #include <class_zone.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <collectors.h>
 #include <confirm.h>
 #include <dialog_find.h>
diff --git a/pcbnew/tr_modif.cpp b/pcbnew/tr_modif.cpp
index 53cda3df9d..26027297b3 100644
--- a/pcbnew/tr_modif.cpp
+++ b/pcbnew/tr_modif.cpp
@@ -32,7 +32,7 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp
index c9c64ff508..bbe4077ef4 100644
--- a/pcbnew/tracepcb.cpp
+++ b/pcbnew/tracepcb.cpp
@@ -31,7 +31,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <class_board.h>
@@ -41,7 +41,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <pcbplot.h>
 
 #include <wx/overlay.h>
diff --git a/pcbnew/undo_redo.cpp b/pcbnew/undo_redo.cpp
index 556dd1cf33..f5c4973b95 100644
--- a/pcbnew/undo_redo.cpp
+++ b/pcbnew/undo_redo.cpp
@@ -33,7 +33,7 @@ using namespace std::placeholders;
 #include <macros.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index c84670b713..6ee19f686e 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -32,7 +32,7 @@
 #include <kiface_i.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <board_commit.h>
 #include <view/view.h>
 
diff --git a/pcbnew/zones_by_polygon_fill_functions.cpp b/pcbnew/zones_by_polygon_fill_functions.cpp
index 18c6beb02a..d769c469fd 100644
--- a/pcbnew/zones_by_polygon_fill_functions.cpp
+++ b/pcbnew/zones_by_polygon_fill_functions.cpp
@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <class_draw_panel_gal.h>
 #include <ratsnest_data.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>
diff --git a/pcbnew/zones_functions_for_undo_redo.cpp b/pcbnew/zones_functions_for_undo_redo.cpp
index 4d4f9d1af1..97b02cbe93 100644
--- a/pcbnew/zones_functions_for_undo_redo.cpp
+++ b/pcbnew/zones_functions_for_undo_redo.cpp
@@ -45,7 +45,7 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_zone.h>
diff --git a/qa/common/mocks.cpp b/qa/common/mocks.cpp
index aad03978c5..d55c040ee0 100644
--- a/qa/common/mocks.cpp
+++ b/qa/common/mocks.cpp
@@ -1,9 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +22,8 @@
  */
 
 /**
- * @file pcbnew.cpp
- * @brief Pcbnew main program.
+ * @file mocks.cpp
+ * @brief Pcbnew main program for qa test.
  */
 
 #include <fctsys.h>
@@ -34,7 +32,7 @@
 #include <confirm.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <wx/stdpaths.h>
 
@@ -48,11 +46,11 @@
 #include <wildcards_and_files_ext.h>
 #include <class_board.h>
 #include <fp_lib_table.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <modview_frame.h>
 #include <footprint_wizard_frame.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_track.h>
diff --git a/qa/common/pcb_test_frame.cpp b/qa/common/pcb_test_frame.cpp
index e7a582ac81..8d47a39243 100644
--- a/qa/common/pcb_test_frame.cpp
+++ b/qa/common/pcb_test_frame.cpp
@@ -44,7 +44,7 @@
 #include <class_zone.h>
 
 #include <pcb_painter.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <connectivity_data.h>