diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 3ed042b13e..f878c58dec 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -379,10 +379,10 @@ set( PCB_COMMON_SRCS
     pcb_plot_params_keywords.cpp
     ../pcbnew/pcb_base_frame.cpp
     ../pcbnew/board_commit.cpp
+    ../pcbnew/board_connected_item.cpp
+    ../pcbnew/board_design_settings.cpp
     ../pcbnew/board_items_to_polygon_shape_transform.cpp
     ../pcbnew/class_board.cpp
-    ../pcbnew/class_board_connected_item.cpp
-    ../pcbnew/class_board_design_settings.cpp
     ../pcbnew/class_board_item.cpp
     ../pcbnew/class_dimension.cpp
     ../pcbnew/class_drawsegment.cpp
diff --git a/common/geometry/hetriang.cpp b/common/geometry/hetriang.cpp
index 2654e02c86..99325286ec 100644
--- a/common/geometry/hetriang.cpp
+++ b/common/geometry/hetriang.cpp
@@ -45,7 +45,7 @@
 #include <algorithm>
 #include <fstream>
 #include <limits>
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 #include <memory>
 
 using namespace hed;
diff --git a/include/class_board_design_settings.h b/include/board_design_settings.h
similarity index 99%
rename from include/class_board_design_settings.h
rename to include/board_design_settings.h
index 8057e286b0..2d7cc9ec93 100644
--- a/include/class_board_design_settings.h
+++ b/include/board_design_settings.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2009-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 1992-2015 KiCad Developers, see CHANGELOG.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
diff --git a/pcbnew/class_board_connected_item.cpp b/pcbnew/board_connected_item.cpp
similarity index 99%
rename from pcbnew/class_board_connected_item.cpp
rename to pcbnew/board_connected_item.cpp
index 42ddc8d331..0ade863eda 100644
--- a/pcbnew/class_board_connected_item.cpp
+++ b/pcbnew/board_connected_item.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file class_board_connected_item.cpp
+ * @file board_connected_item.cpp
  * @brief BOARD_CONNECTED_ITEM class functions.
  */
 
diff --git a/pcbnew/class_board_connected_item.h b/pcbnew/board_connected_item.h
similarity index 99%
rename from pcbnew/class_board_connected_item.h
rename to pcbnew/board_connected_item.h
index faab394395..6d4ff8bbe1 100644
--- a/pcbnew/class_board_connected_item.h
+++ b/pcbnew/board_connected_item.h
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file  class_board_connected_item.h
+ * @file  board_connected_item.h
  * @brief Class BOARD_CONNECTED_ITEM.
  */
 
diff --git a/pcbnew/class_board_design_settings.cpp b/pcbnew/board_design_settings.cpp
similarity index 99%
rename from pcbnew/class_board_design_settings.cpp
rename to pcbnew/board_design_settings.cpp
index c49aefd6a6..fd91a9c4a8 100644
--- a/pcbnew/class_board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -22,7 +22,7 @@
  */
 
 /**
- * @file class_board_design_settings.cpp
+ * @file board_design_settings.cpp
  * BOARD_DESIGN_SETTINGS class functions.
  */
 
@@ -31,7 +31,7 @@
 #include <layers_id_colors_and_visibility.h>
 
 #include <pcbnew.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 
 #include <class_track.h>
 #include <convert_to_biu.h>
diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h
index 3f86ad7b4c..81a048eef4 100644
--- a/pcbnew/class_board.h
+++ b/pcbnew/class_board.h
@@ -39,7 +39,7 @@
 #include <netinfo.h>
 #include <class_pad.h>
 #include <colors_design_settings.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <title_block.h>
 #include <zone_settings.h>
 #include <pcb_plot_params.h>
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index ec89a5317d..bf92eca9b5 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -32,7 +32,7 @@
 
 
 #include <class_board_item.h>
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 #include <pad_shapes.h>
 #include <PolyLine.h>
 #include <config_params.h>       // PARAM_CFG_ARRAY
diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h
index e38ed6412c..1da81e6ff7 100644
--- a/pcbnew/class_track.h
+++ b/pcbnew/class_track.h
@@ -33,10 +33,9 @@
 
 #include <pcbnew.h>
 #include <class_board_item.h>
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 #include <pcb_display_options.h>
 
-//#include <PolyLine.h>
 #include <trigo.h>
 
 
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index 02a11033f2..b15502965a 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -34,7 +34,7 @@
 #include <vector>
 #include <gr_basic.h>
 #include <class_board_item.h>
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 #include <layers_id_colors_and_visibility.h>
 #include <PolyLine.h>
 #include <geometry/shape_poly_set.h>
diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp
index d3929bdb95..49ecdd2983 100644
--- a/pcbnew/dialogs/dialog_design_rules.cpp
+++ b/pcbnew/dialogs/dialog_design_rules.cpp
@@ -36,7 +36,7 @@
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 
 #include <pcbnew_id.h>
 #include <class_track.h>
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index a76b21430d..520df5e2ab 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -35,7 +35,7 @@
 #include <dialog_drc.h>
 #include <pcb_edit_frame.h>
 #include <base_units.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <class_draw_panel_gal.h>
 #include <view/view.h>
 
diff --git a/pcbnew/dialogs/dialog_general_options.cpp b/pcbnew/dialogs/dialog_general_options.cpp
index fc1946d7c2..0dd1ce957a 100644
--- a/pcbnew/dialogs/dialog_general_options.cpp
+++ b/pcbnew/dialogs/dialog_general_options.cpp
@@ -35,7 +35,7 @@
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <kicad_string.h>
 #include <pcbnew_id.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 8846c0eb87..aa30d5aecc 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -42,7 +42,7 @@
 #include <class_drawpanel.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <base_units.h>
 #include <wx/valnum.h>
 #include <board_commit.h>
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
index 864b6e50f5..2d9f1ee6bd 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp
@@ -39,7 +39,7 @@
 #include <class_drawpanel.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <footprint_edit_frame.h>
 #include <base_units.h>
 #include <wx/valnum.h>
diff --git a/pcbnew/dialogs/dialog_mask_clearance.cpp b/pcbnew/dialogs/dialog_mask_clearance.cpp
index e3d3ea8fd4..42e446d0fe 100644
--- a/pcbnew/dialogs/dialog_mask_clearance.cpp
+++ b/pcbnew/dialogs/dialog_mask_clearance.cpp
@@ -27,7 +27,7 @@
 #include <fctsys.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <base_units.h>
 
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_modedit_options.cpp b/pcbnew/dialogs/dialog_modedit_options.cpp
index 12b574e4db..ce1c74cd74 100644
--- a/pcbnew/dialogs/dialog_modedit_options.cpp
+++ b/pcbnew/dialogs/dialog_modedit_options.cpp
@@ -27,7 +27,7 @@
 #include <fctsys.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <base_units.h>
 #include <widgets/text_ctrl_eval.h>
 
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index c21f14fb74..e7c7a32fa9 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -39,7 +39,7 @@
 #include <netlist_reader.h>
 #include <reporter.h>
 
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <connectivity_data.h>
diff --git a/pcbnew/dialogs/dialog_track_via_size.cpp b/pcbnew/dialogs/dialog_track_via_size.cpp
index 1e00858f88..2424071edb 100644
--- a/pcbnew/dialogs/dialog_track_via_size.cpp
+++ b/pcbnew/dialogs/dialog_track_via_size.cpp
@@ -28,7 +28,7 @@
 #include <widgets/text_ctrl_eval.h>
 #include <core/optional.h>
 
-#include "class_board_design_settings.h"
+#include "board_design_settings.h"
 
 DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings ) :
     DIALOG_TRACK_VIA_SIZE_BASE( aParent ),
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 101611793b..7c2d6003f7 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -31,7 +31,7 @@
 #include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 
 #include <class_module.h>
 #include <class_track.h>
diff --git a/pcbnew/drc_marker_functions.cpp b/pcbnew/drc_marker_functions.cpp
index 49e8a75f2d..671cee40f2 100644
--- a/pcbnew/drc_marker_functions.cpp
+++ b/pcbnew/drc_marker_functions.cpp
@@ -35,7 +35,7 @@
 #include <fctsys.h>
 #include <common.h>
 #include <pcbnew.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 
 #include <drc.h>
 #include <class_pad.h>
diff --git a/pcbnew/footprint_editor_options.cpp b/pcbnew/footprint_editor_options.cpp
index 84b3c440b8..7bcc22aa53 100644
--- a/pcbnew/footprint_editor_options.cpp
+++ b/pcbnew/footprint_editor_options.cpp
@@ -34,7 +34,7 @@
 
 #include <pcbnew.h>
 #include <footprint_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
 #include <pcbnew_id.h>
diff --git a/pcbnew/hotkeys_module_editor.cpp b/pcbnew/hotkeys_module_editor.cpp
index d8de679b31..539517cec4 100644
--- a/pcbnew/hotkeys_module_editor.cpp
+++ b/pcbnew/hotkeys_module_editor.cpp
@@ -32,7 +32,7 @@
 #include <pcbnew_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <origin_viewitem.h>
 #include <tools/pcbnew_control.h>
 
diff --git a/pcbnew/pad_edition_functions.cpp b/pcbnew/pad_edition_functions.cpp
index 0a8d1d2330..d0390b6df5 100644
--- a/pcbnew/pad_edition_functions.cpp
+++ b/pcbnew/pad_edition_functions.cpp
@@ -39,7 +39,7 @@
 #include <class_board.h>
 #include <class_module.h>
 #include <class_pad.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 
 /* Exports the current pad settings to board design settings.
  */
diff --git a/pcbnew/pcb_display_options.cpp b/pcbnew/pcb_display_options.cpp
index 72a259e719..95c7b77fec 100644
--- a/pcbnew/pcb_display_options.cpp
+++ b/pcbnew/pcb_display_options.cpp
@@ -26,7 +26,7 @@
 
 #include <common.h>
 #include <pcbnew.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 #include <pcb_display_options.h>
 #include <eda_text.h>
diff --git a/pcbnew/pcb_layer_box_selector.cpp b/pcbnew/pcb_layer_box_selector.cpp
index 443cae2536..b2428f2df7 100644
--- a/pcbnew/pcb_layer_box_selector.cpp
+++ b/pcbnew/pcb_layer_box_selector.cpp
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
 #include <class_board.h>
diff --git a/pcbnew/pcb_screen.cpp b/pcbnew/pcb_screen.cpp
index fe371622b9..a7f47db22d 100644
--- a/pcbnew/pcb_screen.cpp
+++ b/pcbnew/pcb_screen.cpp
@@ -33,7 +33,7 @@
 #include <base_units.h>
 
 #include <pcbnew.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
 #include <pcbnew_id.h>
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index b095347034..5dd057181c 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -39,7 +39,7 @@
 #include <common.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 #include <plotter.h>
 #include <worksheet.h>
 #include <dialog_hotkeys_editor.h>
diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 160ff94e57..66ee91c0d9 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -21,7 +21,7 @@
 
 #include <undo_redo_container.h>
 #include <class_board.h>
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 #include <class_module.h>
 #include <class_track.h>
 #include <board_commit.h>
diff --git a/pcbnew/swig/board_connected_item.i b/pcbnew/swig/board_connected_item.i
index 87c15a7688..ec9d5cc132 100644
--- a/pcbnew/swig/board_connected_item.i
+++ b/pcbnew/swig/board_connected_item.i
@@ -23,10 +23,10 @@
 
 
 
-%include class_board_connected_item.h
+%include board_connected_item.h
 
 %{
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 %}
 
 %typemap(out) std::list<BOARD_CONNECTED_ITEM*> {
@@ -34,18 +34,18 @@
     std::list<BOARD_CONNECTED_ITEM*>::const_iterator iter;
 
     PyObject * retval = $result = PyList_New(0);
-  
+
     for( iter=list.begin(); iter!=list.end(); iter++ ) {
         BOARD_CONNECTED_ITEM* aItem = *iter;
         PyObject* obj = 0x0;
-    
+
         switch( aItem->Type() ) {
-        case PCB_PAD_T:  
+        case PCB_PAD_T:
             obj = SWIG_NewPointerObj( SWIG_as_voidptr(aItem),
                                       SWIGTYPE_p_D_PAD,
                                       0 | 0 );
             break;
-    
+
         case PCB_TRACE_T:
         case PCB_VIA_T:
             obj = SWIG_NewPointerObj( SWIG_as_voidptr(aItem),
@@ -58,7 +58,7 @@
                                       SWIGTYPE_p_ZONE_CONTAINER,
                                       0 | 0 );
             break;
-    
+
         default:
             obj = SWIG_NewPointerObj( SWIG_as_voidptr(aItem),
                                       SWIGTYPE_p_BOARD_CONNECTED_ITEM,
diff --git a/pcbnew/swig/board_design_settings.i b/pcbnew/swig/board_design_settings.i
index 906f0ee7b8..910dc42dc6 100644
--- a/pcbnew/swig/board_design_settings.i
+++ b/pcbnew/swig/board_design_settings.i
@@ -1,4 +1,4 @@
-%include <class_board_design_settings.h>
+%include <board_design_settings.h>
 %{
-#include <class_board_design_settings.h>
+#include <board_design_settings.h>
 %}
diff --git a/pcbnew/tools/pcb_selection_conditions.cpp b/pcbnew/tools/pcb_selection_conditions.cpp
index 75365b3d1e..dd752bebbb 100644
--- a/pcbnew/tools/pcb_selection_conditions.cpp
+++ b/pcbnew/tools/pcb_selection_conditions.cpp
@@ -24,7 +24,7 @@
 
 #include "pcb_selection_conditions.h"
 #include "selection_tool.h"
-#include <class_board_connected_item.h>
+#include <board_connected_item.h>
 
 #include <functional>
 using namespace std::placeholders;