diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 6e123618ca..8ed081294e 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -138,6 +138,7 @@ set( EESCHEMA_SRCS
     sch_collectors.cpp
     sch_component.cpp
     sch_field.cpp
+    sch_item_struct.cpp
     sch_junction.cpp
     sch_line.cpp
     sch_marker.cpp
@@ -163,10 +164,6 @@ set( EESCHEMA_SRCS
     transform.cpp
     viewlib_frame.cpp
     viewlibs.cpp
-
-    # This file does not look common.
-    # Keep it after template_fieldnames_keywords.cpp
-    ../common/sch_item_struct.cpp
     )
 
 
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index fa7c9c52e7..3fccb8e1f9 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <sch_reference_list.h>
 #include <class_library.h>
diff --git a/eeschema/backanno.cpp b/eeschema/backanno.cpp
index 7dd45c05cf..2d4b81edcd 100644
--- a/eeschema/backanno.cpp
+++ b/eeschema/backanno.cpp
@@ -33,7 +33,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <kiface_i.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <build_version.h>
 #include <wildcards_and_files_ext.h>
 
diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index 01c7c3fb04..a1706ecb5e 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <class_library.h>
diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index 95d9bc4348..ed78442e34 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <lib_draw_item.h>
 #include <lib_pin.h>
diff --git a/eeschema/busentry.cpp b/eeschema/busentry.cpp
index 742c5dcb4d..b7baf06892 100644
--- a/eeschema/busentry.cpp
+++ b/eeschema/busentry.cpp
@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <eeschema_id.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <sch_bus_entry.h>
diff --git a/eeschema/class_netlist_object.cpp b/eeschema/class_netlist_object.cpp
index 34c7333a47..3a99199165 100644
--- a/eeschema/class_netlist_object.cpp
+++ b/eeschema/class_netlist_object.cpp
@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <macros.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <sch_component.h>
 #include <class_netlist_object.h>
diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp
index dd041d511f..15eb9e6dca 100644
--- a/eeschema/component_references_lister.cpp
+++ b/eeschema/component_references_lister.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * @file component_references_lister.cpp
  * @brief Code for creating a flat list of components needed for annotation and BOM.
  */
@@ -35,7 +35,7 @@
 
 #include <fctsys.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_reference_list.h>
 #include <sch_component.h>
 
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 981ad38e83..7e42bee023 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 #include <msgpanel.h>
 
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index 570226661c..d5f229b4cc 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -33,7 +33,7 @@
 #include <kiway_express.h>
 #include <macros.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <eeschema_id.h>
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index 8a3c0b6a22..8cf2c1dac5 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -29,7 +29,7 @@
 
 
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <class_drawpanel.h>
 
 #include <invoke_sch_dialog.h>
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 6f71d20960..2de179f9a5 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -33,7 +33,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <sch_sheet.h>
diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index bc59555593..9647edda26 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -35,7 +35,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index bc8c279021..7d12c683c2 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <wx/valgen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <class_drawpanel.h>
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index fd998967c4..b2f3e08bfb 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -31,7 +31,7 @@
 #include <kiway.h>
 #include <confirm.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <id.h>
 #include <base_units.h>
 
@@ -54,7 +54,7 @@ static int s_SelectedRow;
 class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB : public DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
 {
 public:
-    DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB( LIB_EDIT_FRAME* aParent, LIB_PART*      aLibEntry );
+    DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB( LIB_EDIT_FRAME* aParent, LIB_PART* aLibEntry );
     //~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB() {}
 
 private:
diff --git a/eeschema/dialogs/dialog_eeschema_config.cpp b/eeschema/dialogs/dialog_eeschema_config.cpp
index b0f458dcab..3293118ca7 100644
--- a/eeschema/dialogs/dialog_eeschema_config.cpp
+++ b/eeschema/dialogs/dialog_eeschema_config.cpp
@@ -31,7 +31,7 @@
 #include <kiway.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 
 #include <general.h>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 4c41ee57ab..754fa185e3 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -34,7 +34,7 @@
 #include <gestfich.h>
 #include <pgm_base.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 #include <project.h>
 
diff --git a/eeschema/dialogs/dialog_libedit_dimensions.cpp b/eeschema/dialogs/dialog_libedit_dimensions.cpp
index c409ebeba0..2de5135171 100644
--- a/eeschema/dialogs/dialog_libedit_dimensions.cpp
+++ b/eeschema/dialogs/dialog_libedit_dimensions.cpp
@@ -27,7 +27,6 @@
  * Handles the dialog so set current texts and pins sizes in LibEdit
  */
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
 
 #include <general.h>
 #include <libeditframe.h>
diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp
index a47f7f0df9..7fc937f53e 100644
--- a/eeschema/dialogs/dialog_netlist.cpp
+++ b/eeschema/dialogs/dialog_netlist.cpp
@@ -42,7 +42,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <netlist.h>
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index f2bc4fb524..9f7b6ee6ef 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -34,7 +34,7 @@
 #include <worksheet.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet.h>
 #include <dialog_plot_schematic.h>
diff --git a/eeschema/dialogs/dialog_plot_schematic.h b/eeschema/dialogs/dialog_plot_schematic.h
index c2aca65cd4..8f29677232 100644
--- a/eeschema/dialogs/dialog_plot_schematic.h
+++ b/eeschema/dialogs/dialog_plot_schematic.h
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <dialog_plot_schematic_base.h>
 #include <reporter.h>
 
diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index 390b875103..e7c03b58d5 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -28,7 +28,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>
diff --git a/eeschema/edit_bitmap.cpp b/eeschema/edit_bitmap.cpp
index 2a83d10a11..2cdc892075 100644
--- a/eeschema/edit_bitmap.cpp
+++ b/eeschema/edit_bitmap.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_bitmap.h>
 #include <dialog_image_editor.h>
 
diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp
index 8fe4c3e500..67c374f26e 100644
--- a/eeschema/edit_component_in_schematic.cpp
+++ b/eeschema/edit_component_in_schematic.cpp
@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>
diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp
index e81bea06e5..d73c3b23d1 100644
--- a/eeschema/edit_label.cpp
+++ b/eeschema/edit_label.cpp
@@ -33,7 +33,7 @@
 #include <drawtxt.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 
 #include <general.h>
diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp
index 88c6329a23..7f0899d364 100644
--- a/eeschema/eeredraw.cpp
+++ b/eeschema/eeredraw.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <general.h>
 
 
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index b3d25190e9..922247ad20 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <gestfich.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <libeditframe.h>
 #include <viewlib_frame.h>
 #include <eda_text.h>
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index 96ea8f7dc7..bdc57b1f35 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 #include <common.h>
 
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 379b48f620..8084f35fec 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <class_netlist_object.h>
diff --git a/eeschema/events_called_functions_for_edit.cpp b/eeschema/events_called_functions_for_edit.cpp
index 4ab2366698..44d2c3adca 100644
--- a/eeschema/events_called_functions_for_edit.cpp
+++ b/eeschema/events_called_functions_for_edit.cpp
@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <general.h>
 #include <kicad_device_context.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_component.h>
 #include <sch_text.h>
 
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 4a32ef030f..64772d0211 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -32,7 +32,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <pgm_base.h>
 
 #include <eeschema_id.h>
diff --git a/eeschema/find.cpp b/eeschema/find.cpp
index 9bc8275c79..f207a1e853 100644
--- a/eeschema/find.cpp
+++ b/eeschema/find.cpp
@@ -39,7 +39,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 7beaf1baef..6fdb327b9b 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -34,7 +34,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 #include <msgpanel.h>
 
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index 26bb344671..18553aa986 100644
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
+ * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
  * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
  *
@@ -24,14 +24,14 @@
  */
 
 /**
- * @file hierarch.cpp
+ * @file hierarch.schframe
  */
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <id.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <sch_sheet.h>
diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index 809a34ab82..6fefdadfde 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <eeschema_id.h>
 #include <hotkeys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <class_drawpanel.h>
 
 #include <general.h>
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 409492d663..24a9218cbd 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <drawtxt.h>
 #include <plot_common.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 03ffd09e52..100b6aa7a3 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <class_sch_screen.h>
 #include <wxstruct.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <class_library.h>
 #include <sch_component.h>
diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp
index 48779bc871..7e5c073d4a 100644
--- a/eeschema/libeditframe.cpp
+++ b/eeschema/libeditframe.cpp
@@ -35,7 +35,7 @@
 #include <confirm.h>
 #include <eda_doc.h>
 #include <gr_basic.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 47a2a7df06..e63667c752 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <richio.h>
 #include <project.h>
 
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index d3b6b22ed0..e9a22fb818 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <eeschema_id.h>
diff --git a/eeschema/netform.cpp b/eeschema/netform.cpp
index b2b42d298a..3a1ab09c74 100644
--- a/eeschema/netform.cpp
+++ b/eeschema/netform.cpp
@@ -33,7 +33,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <sch_reference_list.h>
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index d78848c779..4b7413da3a 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <confirm.h>
 
 #include <netlist.h>
diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index 8a5a6adcaa..668fdb3471 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -31,7 +31,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 
 #include <sch_bus_entry.h>
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index c5906fff9f..7c08eff063 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -31,7 +31,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 
 #include <general.h>
diff --git a/eeschema/operations_on_items_lists.cpp b/eeschema/operations_on_items_lists.cpp
index ef4daebd87..ed280717cc 100644
--- a/eeschema/operations_on_items_lists.cpp
+++ b/eeschema/operations_on_items_lists.cpp
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <protos.h>
diff --git a/eeschema/plot_schematic_DXF.cpp b/eeschema/plot_schematic_DXF.cpp
index 3786ee82de..523e224a84 100644
--- a/eeschema/plot_schematic_DXF.cpp
+++ b/eeschema/plot_schematic_DXF.cpp
@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>
 #include <project.h>
diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp
index 979e24f40f..f700a3dfac 100644
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <project.h>
diff --git a/eeschema/plot_schematic_PDF.cpp b/eeschema/plot_schematic_PDF.cpp
index 0d59493fc4..06d0d58293 100644
--- a/eeschema/plot_schematic_PDF.cpp
+++ b/eeschema/plot_schematic_PDF.cpp
@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>
diff --git a/eeschema/plot_schematic_PS.cpp b/eeschema/plot_schematic_PS.cpp
index ce221d6795..257c3b5c72 100644
--- a/eeschema/plot_schematic_PS.cpp
+++ b/eeschema/plot_schematic_PS.cpp
@@ -27,7 +27,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>
diff --git a/eeschema/plot_schematic_SVG.cpp b/eeschema/plot_schematic_SVG.cpp
index 2f8a869678..fe22466daf 100644
--- a/eeschema/plot_schematic_SVG.cpp
+++ b/eeschema/plot_schematic_SVG.cpp
@@ -31,7 +31,7 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <libeditframe.h>
 #include <sch_sheet_path.h>
diff --git a/include/sch_base_frame.h b/eeschema/sch_base_frame.h
similarity index 100%
rename from include/sch_base_frame.h
rename to eeschema/sch_base_frame.h
diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index fb93c40c37..43b344ea65 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
-#include <wxEeschemaStruct.h>
+#include <macros.h>
 #include <sch_bitmap.h>
 
 #include <wx/mstream.h>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 85ca4564b6..bf9dc92808 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -31,10 +31,9 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <gr_basic.h>
-#include <trigo.h>
 #include <kicad_string.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <msgpanel.h>
 
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 394d4869c5..a1fdc2d7ab 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -41,8 +41,7 @@
 #include <gr_basic.h>
 #include <drawtxt.h>
 #include <macros.h>
-#include <trigo.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 
 #include <general.h>
diff --git a/common/sch_item_struct.cpp b/eeschema/sch_item_struct.cpp
similarity index 99%
rename from common/sch_item_struct.cpp
rename to eeschema/sch_item_struct.cpp
index a5a8937409..9a2cda7810 100644
--- a/common/sch_item_struct.cpp
+++ b/eeschema/sch_item_struct.cpp
@@ -33,7 +33,7 @@
 #include <sch_item_struct.h>
 #include <class_sch_screen.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 
diff --git a/include/sch_item_struct.h b/eeschema/sch_item_struct.h
similarity index 100%
rename from include/sch_item_struct.h
rename to eeschema/sch_item_struct.h
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 9965fb4c83..6d0d24d66c 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -37,7 +37,7 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <sch_item_struct.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 
 #include <netlist.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 6a732eb1e6..57b9e86a13 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -32,7 +32,7 @@
 #include <drawtxt.h>
 #include <trigo.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <kicad_string.h>
 #include <msgpanel.h>
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index f679a89a59..045b25728a 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -34,10 +34,9 @@
 #include <plot_common.h>
 #include <trigo.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
-#include <protos.h>
 #include <sch_sheet.h>
 #include <kicad_string.h>
 
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index be5b79ff6e..3dc9929687 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -35,7 +35,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <drawtxt.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <base_units.h>
 #include <msgpanel.h>
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index b48ea7e87a..dcad6648cf 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <eda_doc.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 #include <hotkeys_basic.h>
 
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index caa2b4671b..4dcbbe1be5 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <protos.h>
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index 1581292616..4549da4ebf 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -43,7 +43,7 @@
 #include <netlist.h>
 #include <lib_pin.h>
 #include <class_library.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_component.h>
 
 #include <dialog_helpers.h>
diff --git a/include/wxEeschemaStruct.h b/eeschema/schframe.h
similarity index 100%
rename from include/wxEeschemaStruct.h
rename to eeschema/schframe.h
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index d0e143d2b1..59b4b44d30 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <sch_sheet.h>
diff --git a/eeschema/sheetlab.cpp b/eeschema/sheetlab.cpp
index 9069c1fed9..c853b72950 100644
--- a/eeschema/sheetlab.cpp
+++ b/eeschema/sheetlab.cpp
@@ -33,7 +33,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index 726dd6ebe4..92287aff93 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kiface_i.h>
 
 #include <general.h>
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index d4af8a7603..33c2d69cc8 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -32,7 +32,7 @@
 #include <pgm_base.h>
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>