Remove some "class_" prefixes from files.

3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp

@@ -33,7 +33,7 @@
 #include <3d_model_viewer/c3d_model_viewer.h>
 #include <common_ogl/cogl_att_list.h>
 #include <filename_resolver.h>
-#include <pcbnew/class_module.h>
+#include <pcbnew/footprint.h>
 
 #include <wx/filedlg.h>
 

3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp

@@ -32,7 +32,7 @@
 #include <tools/3d_controller.h>
 #include <base_units.h>
 #include <bitmaps.h>
-#include <class_board.h>
+#include <board.h>
 #include <common_ogl/cogl_att_list.h>
 #include <gal/dpi_scaling.h>
 #include <pgm_base.h>

3d-viewer/3d_canvas/board_adapter.cpp

@@ -30,7 +30,7 @@
 #include "../3d_rendering/ccamera.h"
 #include "board_adapter.h"
 #include <3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h>
-#include <class_board.h>
+#include <board.h>
 #include <3d_math.h>
 #include "3d_fastmath.h"
 #include <geometry/geometry_utils.h>

3d-viewer/3d_canvas/board_adapter.h

@@ -36,15 +36,15 @@
 #include "../common_ogl/cogl_att_list.h"
 
 #include <layers_id_colors_and_visibility.h>
-#include <class_pad.h>
+#include <pad.h>
-#include <class_track.h>
+#include <track.h>
 #include <wx/gdicmn.h>
 #include <pcb_base_frame.h>
 #include <pcb_text.h>
 #include <pcb_shape.h>
 #include <dimension.h>
 #include <zone.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <reporter.h>
 
 class COLOR_SETTINGS;

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -35,9 +35,9 @@
 #include "../3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h"
 #include "../3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h"
 #include <board_adapter.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_pad.h>
+#include <pad.h>
 #include <pcb_text.h>
 #include <fp_shape.h>
 #include <zone.h>

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -35,9 +35,9 @@
 #include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h"
 #include "../3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h"
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_pad.h>
+#include <pad.h>
 #include <pcb_text.h>
 #include <fp_shape.h>
 #include <zone.h>

3d-viewer/3d_canvas/create_layer_poly.cpp

@@ -31,7 +31,7 @@
 #include "board_adapter.h"
 #include <convert_basic_shapes_to_polygon.h>
 #include <fp_shape.h>
-#include <class_module.h>
+#include <footprint.h>
 
 
 void BOARD_ADAPTER::buildPadShapeThickOutlineAsPolygon( const D_PAD* aPad,

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -38,7 +38,7 @@
 #include <3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h>
 #include <3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h>
 #include <3d_viewer_id.h>
-#include <class_board.h>
+#include <board.h>
 #include <reporter.h>
 #include <gl_context_mgr.h>
 #include <profile.h>        // To use GetRunningMicroSecs or another profiling utility

3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp

@@ -29,8 +29,8 @@
 
 #include "c3d_render_ogl_legacy.h"
 #include "ogl_legacy_utils.h"
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include "../../3d_math.h"
 #include "../../3d_fastmath.h"
 #include <trigo.h>

3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp

@@ -33,8 +33,8 @@
 #include "ogl_legacy_utils.h"
 #include "common_ogl/ogl_utils.h"
 #include "../cimage.h"
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <3d_math.h>
 #include <math/util.h>      // for KiROUND
 

3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp

@@ -42,8 +42,8 @@
 #include "3d_fastmath.h"
 #include "3d_math.h"
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 
 #include <base_units.h>
 #include <profile.h>        // To use GetRunningMicroSecs or another profiling utility

3d-viewer/3d_viewer/eda_3d_viewer.cpp

@@ -38,7 +38,7 @@
 #include <bitmaps.h>
 #include <board_stackup_manager/class_board_stackup.h>
 #include <board_stackup_manager/stackup_predefined_prms.h>
-#include <class_board.h>
+#include <board.h>
 #include <layers_id_colors_and_visibility.h>
 #include <gal/dpi_scaling.h>
 #include <pgm_base.h>

common/CMakeLists.txt

@@ -501,22 +501,22 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/board_connected_item.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/board_design_settings.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/board_items_to_polygon_shape_transform.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/class_board.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/board.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/class_board_item.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/dimension.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_shape.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/fp_shape.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/class_pcb_group.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_group.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/class_marker_pcb.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/class_module.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/footprint.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netinfo_item.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netinfo_list.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/class_pad.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pad.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_target.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_text.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/board_stackup_manager/class_board_stackup.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/fp_text.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/class_track.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/track.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/zone.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/collectors.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/connectivity/connectivity_algo.cpp

common/fp_lib_table.cpp

@@ -33,7 +33,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <fp_lib_table.h>
-#include <class_module.h>
+#include <footprint.h>
 
 #include <wx/hash.h>
 

common/hash_eda.cpp

@@ -25,10 +25,10 @@
 
 #include <hash_eda.h>
 
-#include <class_module.h>
+#include <footprint.h>
 #include <fp_text.h>
 #include <fp_shape.h>
-#include <class_pad.h>
+#include <pad.h>
 
 #include <functional>
 

common/kiway.cpp

@@ -224,7 +224,8 @@ KIFACE*  KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
             // here and catching it in the KiCad launcher resolves the crash issue.  See bug
             // report https://bugs.launchpad.net/kicad/+bug/1577786.
 
-            msg.Printf( _( "Failed to load kiface library \"%s\"." ), dname );
+            msg.Printf( _( "Failed to load kiface library \"%s\"." ),
+                        dname );
             THROW_IO_ERROR( msg );
         }
         else if( ( addr = dso.GetSymbol( wxT( KIFACE_INSTANCE_NAME_AND_VERSION ) ) ) == NULL )
@@ -232,8 +233,8 @@ KIFACE*  KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
             // Failure: error reporting UI was done via wxLogSysError().
             // No further reporting required here.  Assume the same thing applies here as
             // above with the Load() call.  This has not been tested.
-            msg.Printf(
+            msg.Printf( _( "Could not read instance name and version symbol form kiface "
-                _( "Could not read instance name and version symbol form kiface library \"%s\"." ),
+                           "library \"%s\"." ),
                         dname );
             THROW_IO_ERROR( msg );
         }
@@ -382,7 +383,7 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow
         {
             DisplayErrorMessage( NULL, _( "Error loading editor" ), ioe.What() );
         }
-        catch ( const std::exception& e)
+        catch( const std::exception& e)
         {
             DisplayErrorMessage( NULL, _( "Error loading editor" ), e.what() );
         }

common/widgets/net_selector.cpp

@@ -26,7 +26,7 @@
 
 #include <widgets/net_selector.h>
 
-#include <class_board.h>
+#include <board.h>
 #include <netinfo.h>
 #include <wx/arrstr.h>
 #include <wx/display.h>

cvpcb/display_footprints_frame.cpp

@@ -24,8 +24,8 @@
  */
 
 #include <bitmaps.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <common.h>
 #include <confirm.h>
 #include <cvpcb_settings.h>

include/board_design_settings.h

@@ -25,7 +25,7 @@
 #ifndef BOARD_DESIGN_SETTINGS_H_
 #define BOARD_DESIGN_SETTINGS_H_
 
-#include <class_pad.h>
+#include <pad.h>
 #include <netclass.h>
 #include <config_params.h>
 #include <board_stackup_manager/class_board_stackup.h>

include/pcb_base_frame.h

@@ -33,7 +33,7 @@
 
 
 #include <eda_item.h>
-#include <class_board.h>
+#include <board.h>
 #include <eda_draw_frame.h>
 #include <outline_mode.h>
 #include <lib_id.h>

pcbnew/array_creator.h

@@ -27,8 +27,8 @@
 
 #include <dialogs/dialog_create_array.h>
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <class_board_item.h>
 #include <tools/pcbnew_selection.h>
 

pcbnew/array_pad_name_provider.cpp

@@ -23,7 +23,7 @@
 
 #include <array_pad_name_provider.h>
 
-#include <class_pad.h>
+#include <pad.h>
 
 
 ARRAY_PAD_NAME_PROVIDER::ARRAY_PAD_NAME_PROVIDER(

pcbnew/array_pad_name_provider.h

@@ -26,7 +26,7 @@
 
 
 #include <array_options.h>
-#include <class_module.h>
+#include <footprint.h>
 
 /**
  * Simple class that sequentially provides names from an #ARRAY_OPTIONS

pcbnew/autorouter/ar_autoplacer.cpp

@@ -29,11 +29,11 @@
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <widgets/msgpanel.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_track.h>
+#include <track.h>
 #include <pcb_shape.h>
-#include <class_pad.h>
+#include <pad.h>
 #include <board_commit.h>
 #include <connectivity/connectivity_data.h>
 #include <widgets/progress_reporter.h>

pcbnew/autorouter/ar_autoplacer.h

@@ -31,8 +31,8 @@
 
 #include "ar_matrix.h"
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 
 #include <connectivity/connectivity_data.h>
 

pcbnew/autorouter/ar_matrix.cpp

@@ -31,7 +31,7 @@
 #include <trigo.h>
 
 #include <pcb_shape.h>
-#include <class_pad.h>
+#include <pad.h>
 
 AR_MATRIX::AR_MATRIX()
 {

pcbnew/autorouter/spread_footprints.cpp

@@ -38,8 +38,8 @@
 #include <convert_to_biu.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <rect_placement/rect_placement.h>
 
 struct TSubRect : public CRectPlacement::TRect

pcbnew/board.cpp

@@ -31,9 +31,9 @@
 #include <reporter.h>
 #include <page_layout/ws_proxy_view_item.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_track.h>
+#include <track.h>
 #include <zone.h>
 #include <class_marker_pcb.h>
 #include <pcb_target.h>

pcbnew/board.h

@@ -27,8 +27,8 @@
 
 #include <board_design_settings.h>
 #include <board_item_container.h>
-#include <class_pcb_group.h>
+#include <pcb_group.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <common.h> // Needed for stl hash extensions
 #include <layers_id_colors_and_visibility.h>
 #include <netinfo.h>

pcbnew/board_commit.cpp

@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <pcb_edit_frame.h>
 #include <tool/tool_manager.h>
 #include <tools/selection_tool.h>

pcbnew/board_connected_item.cpp

@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_board.h>
+#include <board.h>
 #include <class_board_item.h>
 #include <connectivity/connectivity_data.h>
 #include <drc/drc_engine.h>

pcbnew/board_design_settings.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <dimension.h>
-#include <class_track.h>
+#include <track.h>
 #include <layers_id_colors_and_visibility.h>
 #include <kiface_i.h>
 #include <board_design_settings.h>

pcbnew/board_items_to_polygon_shape_transform.cpp

@@ -25,14 +25,14 @@
 #include <vector>
 #include <bezier_curves.h>
 #include <trigo.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_pad.h>
+#include <pad.h>
-#include <class_track.h>
+#include <track.h>
 #include <kicad_string.h>
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <zone.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <fp_shape.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <geometry/geometry_utils.h>

pcbnew/board_stackup_manager/class_board_stackup.cpp

@@ -24,7 +24,7 @@
 #include <base_units.h>
 #include <layers_id_colors_and_visibility.h>
 #include <board_design_settings.h>
-#include <class_board.h>
+#include <board.h>
 #include <i18n_utility.h>       // For _HKI definition
 #include "stackup_predefined_prms.h"
 

pcbnew/board_stackup_manager/panel_board_stackup.cpp

@@ -25,7 +25,7 @@
 #include <convert_to_biu.h>
 #include <macros.h>             // arrayDim definition
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <dialogs/dialog_color_picker.h>
 #include <widgets/paged_dialog.h>
 #include <widgets/layer_box_selector.h>

pcbnew/board_stackup_manager/panel_board_stackup.h

@@ -26,7 +26,7 @@
 #define PANEL_SETUP_BOARD_STACKUP_H
 
 
-#include <class_board.h>
+#include <board.h>
 #include <widgets/unit_binder.h>
 
 #include "panel_board_stackup_base.h"

pcbnew/build_BOM_from_board.cpp

@@ -30,8 +30,8 @@
 #include <pcb_edit_frame.h>
 #include <project.h>
 #include <wildcards_and_files_ext.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <wx/listimpl.cpp>
 
 /* creates a BOM list rom board

pcbnew/class_board_item.cpp

@@ -25,7 +25,7 @@
 
 #include <wx/debug.h>
 #include <i18n_utility.h>
-#include <class_board.h>
+#include <board.h>
 #include <string>
 
 wxString BOARD_ITEM::ShowShape( PCB_SHAPE_TYPE_T aShape )

pcbnew/class_marker_pcb.cpp

@@ -26,7 +26,7 @@
 #include <bitmaps.h>
 #include <base_units.h>
 #include <pcb_base_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <class_marker_pcb.h>
 #include <layers_id_colors_and_visibility.h>
 #include <settings/color_settings.h>

pcbnew/collectors.cpp

@@ -25,15 +25,15 @@
 #include <collectors.h>
 #include <class_board_item.h>             // class BOARD_ITEM
 
-#include <class_module.h>
+#include <footprint.h>
 #include <fp_shape.h>
-#include <class_pad.h>
+#include <pad.h>
-#include <class_track.h>
+#include <track.h>
 #include <class_marker_pcb.h>
 #include <dimension.h>
 #include <zone.h>
 #include <pcb_shape.h>
-#include <class_pcb_group.h>
+#include <pcb_group.h>
 #include <macros.h>
 #include <math/util.h>      // for KiROUND
 

pcbnew/connectivity/connectivity_algo.h

@@ -29,9 +29,9 @@
 #ifndef __CONNECTIVITY_ALGO_H
 #define __CONNECTIVITY_ALGO_H
 
-#include <class_board.h>
+#include <board.h>
-#include <class_pad.h>
+#include <pad.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <zone.h>
 
 #include <geometry/shape_poly_set.h>

pcbnew/connectivity/connectivity_items.h

@@ -29,10 +29,10 @@
 #ifndef PCBNEW_CONNECTIVITY_CONNECTIVITY_ITEMS_H_
 #define PCBNEW_CONNECTIVITY_CONNECTIVITY_ITEMS_H_
 
-#include <class_board.h>
+#include <board.h>
-#include <class_pad.h>
+#include <pad.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_track.h>
+#include <track.h>
 #include <zone.h>
 
 #include <geometry/shape_poly_set.h>

pcbnew/connectivity/from_to_cache.cpp

@@ -20,8 +20,8 @@
 #include <cstdio>
 #include <memory>
 #include <reporter.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_track.h>
+#include <track.h>
 #include <kicad_string.h>
 
 #include <pcb_expr_evaluator.h>

pcbnew/convert_drawsegment_list_to_polygon.cpp

@@ -34,7 +34,7 @@
 
 #include <math/vector2d.h>
 #include <pcb_shape.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <base_units.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <geometry/shape_poly_set.h>
@@ -788,7 +788,7 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
     return !selfIntersecting;
 }
 
-#include <class_board.h>
+#include <board.h>
 #include <collectors.h>
 
 /* This function is used to extract a board outlines (3D view, automatic zones build ...)

pcbnew/cross-probing.cpp

@@ -31,9 +31,9 @@
  * Note: these ports must be enabled for firewall protection
  */
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_track.h>
+#include <track.h>
 #include <collectors.h>
 #include <eda_dde.h>
 #include <kiface_i.h>

pcbnew/dialogs/dialog_board_reannotate.h

@@ -26,8 +26,8 @@
 #ifndef DIALOG_BOARD_REANNOTATE_H_
 #define DIALOG_BOARD_REANNOTATE_H_
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <dialogs/dialog_board_reannotate_base.h>
 #include <layers_id_colors_and_visibility.h>
 #include <netlist_reader/pcb_netlist.h>

pcbnew/dialogs/dialog_board_statistics.h

@@ -28,8 +28,8 @@
 
 
 #include <base_units.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_track.h>
+#include <track.h>
 #include <confirm.h>
 #include <dialog_board_statistics_base.h>
 #include <pad_shapes.h>

pcbnew/dialogs/dialog_copper_zones.cpp

@@ -31,7 +31,7 @@
 #include <bitmaps.h>
 #include <widgets/unit_binder.h>
 #include <zone.h>
-#include <class_board.h>
+#include <board.h>
 #include <trigo.h>
 
 #include <dialog_copper_zones_base.h>

pcbnew/dialogs/dialog_create_array.cpp

@@ -27,8 +27,8 @@
 
 #include <widgets/text_ctrl_eval.h>
 
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <pcb_edit_frame.h>
 
 #include <boost/algorithm/string/join.hpp>

pcbnew/dialogs/dialog_dimension_properties.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <class_board.h>
+#include <board.h>
 #include <dimension.h>
 #include <pcb_base_edit_frame.h>
 #include <pcb_layer_box_selector.h>

pcbnew/dialogs/dialog_drc.h

@@ -30,7 +30,7 @@
 #include <wx/htmllbox.h>
 #include <rc_item.h>
 #include <class_marker_pcb.h>
-#include <class_board.h>
+#include <board.h>
 #include <dialog_drc_base.h>
 #include <widgets/progress_reporter.h>
 

pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp

@@ -35,7 +35,7 @@
 #include <widgets/grid_text_button_helpers.h>
 #include <widgets/wx_grid.h>
 #include <widgets/text_ctrl_eval.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <dialog_edit_footprint_for_fp_editor.h>

pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h

@@ -28,7 +28,7 @@
 #include <vector>
 #include <text_mod_grid_table.h>
 #include <widgets/unit_binder.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <dialog_edit_footprint_for_fp_editor_base.h>
 
 

pcbnew/dialogs/dialog_exchange_footprints.cpp

@@ -26,8 +26,8 @@
 
 #include <bitmaps.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <dialog_exchange_footprints.h>
 #include <kicad_string.h>
 #include <kiway.h>

pcbnew/dialogs/dialog_export_idf.cpp

@@ -23,7 +23,7 @@
  */
 
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <widgets/text_ctrl_eval.h>
 #include <dialog_export_idf_base.h>
 #include <pcbnew_settings.h>

pcbnew/dialogs/dialog_export_step.cpp

@@ -30,7 +30,7 @@
 #include "kiface_i.h"
 #include "confirm.h"
 #include "reporter.h"
-#include "class_board.h"
+#include "board.h"
 #include "dialog_export_step_base.h"
 #include <locale_io.h>
 #include <pcbnew_settings.h>

pcbnew/dialogs/dialog_export_svg.cpp

@@ -31,7 +31,7 @@
 #include <core/kicad_algo.h>
 #include <pcbplot.h>
 #include <locale_io.h>
-#include <class_board.h>
+#include <board.h>
 #include <dialog_export_svg_base.h>
 #include <wx_html_report_panel.h>
 #include <bitmaps.h>

pcbnew/dialogs/dialog_export_vrml.cpp

@@ -28,7 +28,7 @@
  */
 #include <wx/dir.h>
 
-#include <class_board.h>
+#include <board.h>
 #include <confirm.h>
 #include <kiface_i.h>
 #include <pcb_edit_frame.h>

pcbnew/dialogs/dialog_find.cpp

@@ -23,9 +23,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_board.h>
+#include <board.h>
 #include <class_marker_pcb.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <pcb_text.h>
 #include <fp_text.h>
 #include <dialog_find.h>

pcbnew/dialogs/dialog_footprint_properties.cpp

@@ -28,7 +28,7 @@
 #include <bitmaps.h>
 #include <board_commit.h>
 #include <board_design_settings.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <confirm.h>
 #include <dialog_text_entry.h>
 #include <filename_resolver.h>

pcbnew/dialogs/dialog_footprint_properties.h

@@ -30,7 +30,7 @@
 #include <dialog_footprint_properties_base.h>
 #include <wx/valnum.h>
 #include <text_mod_grid_table.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <widgets/unit_binder.h>
 
 

pcbnew/dialogs/dialog_gencad_export_options.cpp

@@ -27,7 +27,7 @@
 #include "dialog_gencad_export_options.h"
 
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <project.h>
 #include <confirm.h>
 #include <wildcards_and_files_ext.h>

pcbnew/dialogs/dialog_gendrill.cpp

@@ -30,9 +30,9 @@
 #include <gendrill_gerber_writer.h>
 #include <bitmaps.h>
 #include <tools/pcb_editor_control.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_track.h>
+#include <track.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <dialog_gendrill.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>

pcbnew/dialogs/dialog_global_deletion.cpp

@@ -29,9 +29,9 @@ using namespace std::placeholders;
 #include <pcb_edit_frame.h>
 #include <ratsnest/ratsnest_data.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
-#include <class_track.h>
+#include <track.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/global_edit_tool.h>

pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp

@@ -26,8 +26,8 @@
 #include <board_commit.h>
 #include <pcb_edit_frame.h>
 #include <pcb_layer_box_selector.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <dimension.h>
 #include <fp_shape.h>
 #include <pcb_text.h>

pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp

@@ -23,8 +23,8 @@
  */
 
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_track.h>
+#include <track.h>
 #include <connectivity/connectivity_data.h>
 #include <pcb_layer_box_selector.h>
 #include <tool/tool_manager.h>

pcbnew/dialogs/dialog_import_settings.cpp

@@ -23,7 +23,7 @@
 
 #include <bitmaps.h>
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <wildcards_and_files_ext.h>
 #include <confirm.h>
 

pcbnew/dialogs/dialog_net_inspector.cpp

@@ -25,8 +25,8 @@
 
 #include <kicad_string.h>
 #include <tools/pcb_inspection_tool.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_track.h>
+#include <track.h>
 #include <dialog_net_inspector.h>
 #include <eda_pattern_match.h>
 #include <wildcards_and_files_ext.h>

pcbnew/dialogs/dialog_netlist.cpp

@@ -31,7 +31,7 @@
 #include <bitmaps.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
-#include <class_board.h>
+#include <board.h>
 #include <connectivity/connectivity_data.h>
 #include <wildcards_and_files_ext.h>
 #include <netlist_reader/pcb_netlist.h>

pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp

@@ -34,7 +34,7 @@
 #include <pcb_base_frame.h>
 #include <base_units.h>
 #include <widgets/wx_grid.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <math/util.h>      // for KiROUND
 
 #include <dialog_pad_properties.h>

pcbnew/dialogs/dialog_pad_properties.cpp

@@ -27,8 +27,8 @@
 #include <base_units.h>
 #include <bitmaps.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <confirm.h>
 #include <convert_basic_shapes_to_polygon.h> // for enum RECT_CHAMFER_POSITIONS definition
 #include <geometry/shape_segment.h>

pcbnew/dialogs/dialog_pad_properties.h

@@ -31,8 +31,8 @@
 #include <pcb_base_frame.h>
 #include <base_units.h>
 #include <wx/valnum.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <pcb_shape.h>
 #include <origin_viewitem.h>
 #include <dialog_pad_properties_base.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -34,7 +34,7 @@
 #include <layers_id_colors_and_visibility.h>
 #include <locale_io.h>
 #include <bitmaps.h>
-#include <class_board.h>
+#include <board.h>
 #include <dialog_plot.h>
 #include <dialog_gendrill.h>
 #include <wx_html_report_panel.h>

pcbnew/dialogs/dialog_plot.h

@@ -25,7 +25,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_board.h>
+#include <board.h>
 #include <dialog_plot_base.h>
 #include <pcb_plot_params.h>
 #include <widgets/unit_binder.h>

pcbnew/dialogs/dialog_print_pcbnew.cpp

@@ -29,7 +29,7 @@
 #include <base_units.h>
 #include <pcbnew_settings.h>
 #include <pcbplot.h>
-#include <class_board.h>
+#include <board.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/pcbnew_control.h>

pcbnew/dialogs/dialog_push_pad_properties.cpp

@@ -24,7 +24,7 @@
 
 #include <dialog_push_pad_properties.h>
 
-#include <class_pad.h>
+#include <pad.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
 

pcbnew/dialogs/dialog_swap_layers.cpp

@@ -23,10 +23,10 @@
 
 #include <pcb_base_edit_frame.h>
 #include <grid_layer_box_helpers.h>
-#include <class_track.h>
+#include <track.h>
 #include <view/view.h>
 #include <widgets/wx_grid.h>
-#include <class_board.h>
+#include <board.h>
 #include "dialog_swap_layers.h"
 
 

pcbnew/dialogs/dialog_target_properties.cpp

@@ -27,7 +27,7 @@
 #include <dialog_helpers.h>
 #include <base_units.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
 #include <pcb_target.h>
 #include <dialog_target_properties_base.h>
 #include <widgets/unit_binder.h>

pcbnew/dialogs/dialog_text_properties.cpp

@@ -26,8 +26,8 @@
 #include <confirm.h>
 #include <widgets/unit_binder.h>
 #include <board_commit.h>
-#include <class_board.h>
+#include <board.h>
-#include <class_module.h>
+#include <footprint.h>
 #include <pcb_text.h>
 #include <fp_text.h>
 #include <pcb_edit_frame.h>

pcbnew/dialogs/dialog_track_via_properties.cpp

@@ -26,7 +26,7 @@
 #include <dialogs/dialog_track_via_properties.h>
 #include <pcb_layer_box_selector.h>
 #include <tools/selection_tool.h>
-#include <class_track.h>
+#include <track.h>
 #include <pcb_edit_frame.h>
 #include <confirm.h>
 #include <connectivity/connectivity_data.h>

pcbnew/dialogs/dialog_unused_pad_layers.cpp

@@ -26,8 +26,8 @@
 
 #include <bitmaps.h>
 #include <board_commit.h>
-#include <class_track.h>
+#include <track.h>
-#include <class_pad.h>
+#include <pad.h>
 #include <pcb_edit_frame.h>
 #include <tools/selection_tool.h>
 

pcbnew/dialogs/dialog_update_pcb.cpp

@@ -36,7 +36,7 @@
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>
-#include <class_board.h>
+#include <board.h>
 #include <kiface_i.h>
 
 using namespace std::placeholders;

pcbnew/dialogs/panel_edit_options.cpp

@@ -23,7 +23,7 @@
  */
 
 #include <board_design_settings.h>
-#include <class_board.h>
+#include <board.h>
 #include <panel_edit_options.h>
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>

pcbnew/dialogs/panel_modedit_color_settings.cpp

@@ -20,7 +20,7 @@
 
 #include <regex>
 
-#include <class_board.h>
+#include <board.h>
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <gal/gal_display_options.h>

pcbnew/dialogs/panel_pcbnew_color_settings.cpp

@@ -20,7 +20,7 @@
 
 #include <regex>
 
-#include <class_board.h>
+#include <board.h>
 #include <gal/gal_display_options.h>
 #include <layers_id_colors_and_visibility.h>
 #include <panel_pcbnew_color_settings.h>
@@ -32,7 +32,7 @@
 #include <widgets/appearance_controls.h>
 #include <page_layout/ws_proxy_view_item.h>
 #include <pcb_painter.h>
-#include <class_track.h>
+#include <track.h>
 #include <plugins/kicad/kicad_plugin.h>
 
 

pcbnew/dialogs/panel_pcbnew_display_origin.cpp

@@ -23,7 +23,7 @@
  */
 
 #include <board_design_settings.h>
-#include <class_board.h>
+#include <board.h>
 #include <panel_pcbnew_display_origin.h>
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>

pcbnew/dialogs/panel_setup_feature_constraints.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <board_design_settings.h>
-#include <class_board.h>                           // for BOARD
+#include <board.h>                           // for BOARD
 #include <convert_to_biu.h>                        // for IU_PER_MM
 #include <math/util.h>
 #include <panel_setup_feature_constraints.h>

pcbnew/dialogs/panel_setup_layers.cpp

@@ -28,7 +28,7 @@
 #include <core/kicad_algo.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <class_board.h>
+#include <board.h>
 #include <collectors.h>
 #include <panel_setup_layers.h>
 

pcbnew/dialogs/panel_setup_mask_and_paste.h

@@ -25,7 +25,7 @@
 #ifndef PANEL_SETUP_DEFAULT_CLEARANCES_H
 #define PANEL_SETUP_DEFAULT_CLEARANCES_H
 
-#include <class_board.h>
+#include <board.h>
 #include <widgets/unit_binder.h>
 #include <widgets/paged_dialog.h>
 #include <dialogs/panel_setup_mask_and_paste_base.h>

pcbnew/dialogs/panel_setup_rules.cpp

@@ -25,7 +25,7 @@
 #include <widgets/paged_dialog.h>
 #include <pcb_edit_frame.h>
 #include <pcb_expr_evaluator.h>
-#include <class_board.h>
+#include <board.h>
 #include <board_design_settings.h>
 #include <project.h>
 #include <kicad_string.h>

pcbnew/dialogs/panel_setup_text_and_graphics.h

@@ -25,7 +25,7 @@
 #ifndef PANEL_SETUP_TEXT_AND_GRAPHICS_H
 #define PANEL_SETUP_TEXT_AND_GRAPHICS_H
 
-#include <class_board.h>
+#include <board.h>
 #include <widgets/unit_binder.h>
 #include <widgets/paged_dialog.h>
 

pcbnew/dialogs/panel_setup_tracks_and_vias.h

@@ -25,7 +25,7 @@
 #ifndef PANEL_SETUP_TRACKS_AND_VIAS_H
 #define PANEL_SETUP_TRACKS_AND_VIAS_H
 
-#include <class_board.h>
+#include <board.h>
 #include <widgets/unit_binder.h>
 #include <widgets/paged_dialog.h>
 

pcbnew/dimension.cpp

@@ -27,7 +27,7 @@
 #include <bitmaps.h>
 #include <pcb_edit_frame.h>
 #include <base_units.h>
-#include <class_board.h>
+#include <board.h>
 #include <dimension.h>
 #include <pcb_text.h>
 #include <geometry/shape_circle.h>

pcbnew/drc/drc_engine.cpp

@@ -30,7 +30,7 @@
 #include <drc/drc_rule.h>
 #include <drc/drc_rule_condition.h>
 #include <drc/drc_test_provider.h>
-#include <class_track.h>
+#include <track.h>
 
 void drcPrintDebugMessage( int level, const wxString& msg, const char *function, int line )
 {

pcbnew/drc/drc_item.cpp

@@ -26,7 +26,7 @@
 #include "wx/html/m_templ.h"
 #include "wx/html/styleparams.h"
 #include <drc/drc_item.h>
-#include <class_board.h>
+#include <board.h>
 
 
 // These, being statically-defined, require specialized I18N handling.  We continue to

pcbnew/drc/drc_results_provider.h

@@ -25,7 +25,7 @@
 #ifndef DRC_PROVIDER__H
 #define DRC_PROVIDER__H
 
-#include <class_board.h>
+#include <board.h>
 #include <class_marker_pcb.h>
 #include <pcb_base_frame.h>
 #include <drc/drc_item.h>

pcbnew/drc/drc_rtree.h

@@ -27,7 +27,7 @@
 
 #include <eda_rect.h>
 #include <class_board_item.h>
-#include <class_track.h>
+#include <track.h>
 #include <unordered_set>
 #include <set>
 #include <vector>

pcbnew/drc/drc_rule.cpp

@@ -22,7 +22,7 @@
  */
 
 
-#include <class_board.h>
+#include <board.h>
 #include <class_board_item.h>
 #include <drc/drc_rule.h>
 #include <drc/drc_rule_condition.h>

pcbnew/drc/drc_rule_parser.cpp

@@ -22,7 +22,7 @@
  */
 
 
-#include <class_board.h>
+#include <board.h>
 #include <drc/drc_rule_parser.h>
 #include <drc/drc_rule_condition.h>
 #include <drc_rules_lexer.h>