diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 893efd8fc5..652c2917c8 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -323,8 +323,17 @@ set( SYNC_SHEET_PIN_SRCS
     sync_sheet_pin/sheet_synchronization_model.cpp
     )
 
+set( EESCHEMA_ERC_SRCS
+    erc/erc.cpp
+    erc/erc_item.cpp
+    erc/erc_report.cpp
+    erc/erc_sch_pin_context.cpp
+    erc/erc_settings.cpp
+    )
+
 set( EESCHEMA_SRCS
     ${EESCHEMA_DLGS}
+    ${EESCHEMA_ERC_SRCS}
     ${EESCHEMA_LIBEDIT_SRCS}
     ${EESCHEMA_SCH_IO}
     ${EESCHEMA_SIM_SRCS}
@@ -342,11 +351,6 @@ set( EESCHEMA_SRCS
     eeschema_helpers.cpp
     eeschema_jobs_handler.cpp
     eeschema_settings.cpp
-    erc.cpp
-    erc_item.cpp
-    erc_report.cpp
-    erc_sch_pin_context.cpp
-    erc_settings.cpp
     fields_data_model.cpp
     fields_grid_table.cpp
     files-io.cpp
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 31f055fe5d..180aab201e 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -28,7 +28,7 @@
 #include <sch_edit_frame.h>
 #include <schematic.h>
 #include <sch_commit.h>
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <sch_reference_list.h>
 #include <symbol_library.h>
 #include <tools/ee_selection.h>
diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index d003ada009..f19c6b74a5 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -28,7 +28,7 @@
 #include <core/kicad_algo.h>
 #include <common.h>
 #include <core/kicad_algo.h>
-#include <erc.h>
+#include <erc/erc.h>
 #include <pin_type.h>
 #include <sch_bus_entry.h>
 #include <sch_symbol.h>
diff --git a/eeschema/connection_graph.h b/eeschema/connection_graph.h
index d9e87bd0ec..432decce99 100644
--- a/eeschema/connection_graph.h
+++ b/eeschema/connection_graph.h
@@ -26,7 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <sch_connection.h>
 #include <sch_item.h>
 #include <wx/treectrl.h>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 420dcc0222..072d9a7a8e 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -37,14 +37,14 @@
 #include <tools/ee_actions.h>
 #include <tools/ee_inspection_tool.h>
 #include <dialog_erc.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <id.h>
 #include <confirm.h>
 #include <common.h>
 #include <widgets/wx_html_report_box.h>
 #include <dialogs/dialog_text_entry.h>
-#include <erc_item.h>
+#include <erc/erc_item.h>
 #include <eeschema_settings.h>
 #include <string_utils.h>
 #include <kiplatform/ui.h>
diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp
index e5a8bb676f..8834a90e5a 100644
--- a/eeschema/dialogs/dialog_schematic_setup.cpp
+++ b/eeschema/dialogs/dialog_schematic_setup.cpp
@@ -27,7 +27,7 @@
 #include <dialogs/panel_setup_buses.h>
 #include <panel_setup_formatting.h>
 #include <panel_setup_pinmap.h>
-#include <erc_item.h>
+#include <erc/erc_item.h>
 #include <panel_text_variables.h>
 #include <panel_bom_presets.h>
 #include <project/project_file.h>
diff --git a/eeschema/dialogs/panel_setup_pinmap.cpp b/eeschema/dialogs/panel_setup_pinmap.cpp
index 7d3cd3b2c9..415f2dc11d 100644
--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/eeschema/dialogs/panel_setup_pinmap.cpp
@@ -30,7 +30,7 @@
 #include <tools/ee_actions.h>
 #include <tool/tool_manager.h>
 #include <panel_setup_pinmap.h>
-#include <erc.h>
+#include <erc/erc.h>
 #include <id.h>
 #include <wx/bmpbuttn.h>
 #include <wx/statline.h>
diff --git a/eeschema/dialogs/panel_setup_pinmap.h b/eeschema/dialogs/panel_setup_pinmap.h
index 8d22e43ab5..b8909407d6 100644
--- a/eeschema/dialogs/panel_setup_pinmap.h
+++ b/eeschema/dialogs/panel_setup_pinmap.h
@@ -26,7 +26,7 @@
 #define _PANEL_SETUP_PINMAP_H_
 
 #include <sch_pin.h>        // For PINTYPE_COUNT definition
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include "panel_setup_pinmap_base.h"
 
 
diff --git a/eeschema/eeschema_jobs_handler.cpp b/eeschema/eeschema_jobs_handler.cpp
index 66ba7d4141..63c159a104 100644
--- a/eeschema/eeschema_jobs_handler.cpp
+++ b/eeschema/eeschema_jobs_handler.cpp
@@ -40,8 +40,8 @@
 #include <kiway.h>
 #include <sch_painter.h>
 #include <locale_io.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <wildcards_and_files_ext.h>
 #include <plotters/plotters_pslike.h>
 #include <drawing_sheet/ds_data_model.h>
diff --git a/eeschema/erc.cpp b/eeschema/erc/erc.cpp
similarity index 99%
rename from eeschema/erc.cpp
rename to eeschema/erc/erc.cpp
index 1a8e20a208..e6d20dde0b 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc/erc.cpp
@@ -30,8 +30,8 @@
 #include "kiface_ids.h"
 #include <advanced_config.h>
 #include <common.h>     // for ExpandEnvVarSubstitutions
-#include <erc.h>
-#include <erc_sch_pin_context.h>
+#include <erc/erc.h>
+#include <erc/erc_sch_pin_context.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <string_utils.h>
 #include <sch_pin.h>
diff --git a/eeschema/erc.h b/eeschema/erc/erc.h
similarity index 99%
rename from eeschema/erc.h
rename to eeschema/erc/erc.h
index 7d3fa2d22c..0ed1031492 100644
--- a/eeschema/erc.h
+++ b/eeschema/erc/erc.h
@@ -26,7 +26,7 @@
 #ifndef ERC_H
 #define ERC_H
 
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <vector>
 #include <map>
 
diff --git a/eeschema/erc_item.cpp b/eeschema/erc/erc_item.cpp
similarity index 99%
rename from eeschema/erc_item.cpp
rename to eeschema/erc/erc_item.cpp
index caf806b075..7c9fa496ad 100644
--- a/eeschema/erc_item.cpp
+++ b/eeschema/erc/erc_item.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/html/m_templ.h"
 #include "wx/html/styleparams.h"
-#include <erc.h>
+#include <erc/erc.h>
 #include <eda_draw_frame.h>
 #include <marker_base.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/erc_item.h b/eeschema/erc/erc_item.h
similarity index 100%
rename from eeschema/erc_item.h
rename to eeschema/erc/erc_item.h
diff --git a/eeschema/erc_report.cpp b/eeschema/erc/erc_report.cpp
similarity index 99%
rename from eeschema/erc_report.cpp
rename to eeschema/erc/erc_report.cpp
index 7c7dd4e957..e9c07939e2 100644
--- a/eeschema/erc_report.cpp
+++ b/eeschema/erc/erc_report.cpp
@@ -27,7 +27,7 @@
 #include <build_version.h>
 #include "erc_report.h"
 #include <eda_units.h>
-#include <erc.h>
+#include <erc/erc.h>
 #include <fstream>
 #include <macros.h>
 #include <nlohmann/json.hpp>
diff --git a/eeschema/erc_report.h b/eeschema/erc/erc_report.h
similarity index 100%
rename from eeschema/erc_report.h
rename to eeschema/erc/erc_report.h
diff --git a/eeschema/erc_sch_pin_context.cpp b/eeschema/erc/erc_sch_pin_context.cpp
similarity index 97%
rename from eeschema/erc_sch_pin_context.cpp
rename to eeschema/erc/erc_sch_pin_context.cpp
index 0586e55464..233a6473a4 100644
--- a/eeschema/erc_sch_pin_context.cpp
+++ b/eeschema/erc/erc_sch_pin_context.cpp
@@ -27,7 +27,7 @@
  * @file erc_sch_pin_context.cpp
  */
 
-#include <erc_sch_pin_context.h>
+#include <erc/erc_sch_pin_context.h>
 
 
 SCH_PIN* ERC_SCH_PIN_CONTEXT::Pin()
diff --git a/eeschema/erc_sch_pin_context.h b/eeschema/erc/erc_sch_pin_context.h
similarity index 100%
rename from eeschema/erc_sch_pin_context.h
rename to eeschema/erc/erc_sch_pin_context.h
diff --git a/eeschema/erc_settings.cpp b/eeschema/erc/erc_settings.cpp
similarity index 99%
rename from eeschema/erc_settings.cpp
rename to eeschema/erc/erc_settings.cpp
index 81e208cbfd..b962eb8ad5 100644
--- a/eeschema/erc_settings.cpp
+++ b/eeschema/erc/erc_settings.cpp
@@ -18,8 +18,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <erc_item.h>
-#include <erc_settings.h>
+#include <erc/erc_item.h>
+#include <erc/erc_settings.h>
 #include <schematic.h>
 #include <sch_marker.h>
 #include <sch_screen.h>
diff --git a/eeschema/erc_settings.h b/eeschema/erc/erc_settings.h
similarity index 99%
rename from eeschema/erc_settings.h
rename to eeschema/erc/erc_settings.h
index 5e0fc6cae3..56d39cbf48 100644
--- a/eeschema/erc_settings.h
+++ b/eeschema/erc/erc_settings.h
@@ -22,7 +22,7 @@
 #ifndef _ERC_SETTINGS_H
 #define _ERC_SETTINGS_H
 
-#include <erc_item.h>
+#include <erc/erc_item.h>
 #include <pin_type.h>
 #include <settings/nested_settings.h>
 #include <widgets/ui_common.h>
diff --git a/eeschema/netlist_exporters/netlist_generator.cpp b/eeschema/netlist_exporters/netlist_generator.cpp
index f65db3d4e4..f0f7722e0f 100644
--- a/eeschema/netlist_exporters/netlist_generator.cpp
+++ b/eeschema/netlist_exporters/netlist_generator.cpp
@@ -32,7 +32,7 @@
 #include <reporter.h>
 #include <confirm.h>
 #include <kiway.h>
-#include <erc.h>
+#include <erc/erc.h>
 
 #include <netlist.h>
 #include <netlist_exporter_base.h>
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index 60cd484884..5f32d77302 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -28,14 +28,14 @@
 #include <bitmaps.h>
 #include <base_units.h>
 #include <eda_draw_frame.h>
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <sch_marker.h>
 #include <schematic.h>
 #include <widgets/ui_common.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <settings/color_settings.h>
-#include <erc_item.h>
+#include <erc/erc_item.h>
 #include <sch_screen.h>
 
 /// Factor to convert the maker unit shape to internal units:
diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h
index 984400856f..9d67cf5416 100644
--- a/eeschema/sch_marker.h
+++ b/eeschema/sch_marker.h
@@ -25,7 +25,7 @@
 #ifndef TYPE_SCH_MARKER_H_
 #define TYPE_SCH_MARKER_H_
 
-#include <erc_item.h>
+#include <erc/erc_item.h>
 #include <sch_item.h>
 #include <marker_base.h>
 
diff --git a/eeschema/sch_reference_list.cpp b/eeschema/sch_reference_list.cpp
index 35a9434bd0..996bfc8f5a 100644
--- a/eeschema/sch_reference_list.cpp
+++ b/eeschema/sch_reference_list.cpp
@@ -37,7 +37,7 @@
 #include <unordered_set>
 
 #include <string_utils.h>
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <sch_symbol.h>
 #include <sch_edit_frame.h>
 
diff --git a/eeschema/sch_reference_list.h b/eeschema/sch_reference_list.h
index ebe44b7a16..f1b3321c87 100644
--- a/eeschema/sch_reference_list.h
+++ b/eeschema/sch_reference_list.h
@@ -33,7 +33,7 @@
 #include <sch_sheet_path.h>
 #include <sch_symbol.h>
 #include <sch_text.h>
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 
 
 /** Schematic annotation scope options. */
diff --git a/eeschema/sch_rule_area.cpp b/eeschema/sch_rule_area.cpp
index 36958e3f02..4f3fbbc848 100644
--- a/eeschema/sch_rule_area.cpp
+++ b/eeschema/sch_rule_area.cpp
@@ -27,8 +27,8 @@
 #include <vector>
 
 #include <eda_draw_frame.h>
-#include <erc_item.h>
-#include <erc_settings.h>
+#include <erc/erc_item.h>
+#include <erc/erc_settings.h>
 #include <geometry/shape_segment.h>
 #include <geometry/shape_simple.h>
 #include <sch_line.h>
diff --git a/eeschema/schematic.cpp b/eeschema/schematic.cpp
index 238518373e..83e0ab9e25 100644
--- a/eeschema/schematic.cpp
+++ b/eeschema/schematic.cpp
@@ -23,7 +23,7 @@
 #include <core/ignore.h>
 #include <core/kicad_algo.h>
 #include <ee_collectors.h>
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 #include <sch_marker.h>
 #include <project.h>
 #include <project/project_file.h>
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index e79e655c0e..d0eb525fa1 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -34,7 +34,7 @@
 #include <dialogs/dialog_update_from_pcb.h>
 #include <dialogs/hotkey_cycle_popup.h>
 #include <project_rescue.h>
-#include <erc.h>
+#include <erc/erc.h>
 #include <invoke_sch_dialog.h>
 #include <string_utils.h>
 #include <kiway.h>
diff --git a/qa/tests/eeschema/erc/test_erc_global_labels.cpp b/qa/tests/eeschema/erc/test_erc_global_labels.cpp
index eab9ddd7d3..fffe4245d7 100644
--- a/qa/tests/eeschema/erc/test_erc_global_labels.cpp
+++ b/qa/tests/eeschema/erc/test_erc_global_labels.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
 
diff --git a/qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp b/qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp
index 9ffbf77171..d461917179 100644
--- a/qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp
+++ b/qa/tests/eeschema/erc/test_erc_hierarchical_schematics.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
 
diff --git a/qa/tests/eeschema/erc/test_erc_label_not_connected.cpp b/qa/tests/eeschema/erc/test_erc_label_not_connected.cpp
index aae9977661..1837de4fba 100644
--- a/qa/tests/eeschema/erc/test_erc_label_not_connected.cpp
+++ b/qa/tests/eeschema/erc/test_erc_label_not_connected.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
 
diff --git a/qa/tests/eeschema/erc/test_erc_no_connect.cpp b/qa/tests/eeschema/erc/test_erc_no_connect.cpp
index a4c8e8aea1..71ab88d087 100644
--- a/qa/tests/eeschema/erc/test_erc_no_connect.cpp
+++ b/qa/tests/eeschema/erc/test_erc_no_connect.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
 
diff --git a/qa/tests/eeschema/erc/test_erc_rule_areas.cpp b/qa/tests/eeschema/erc/test_erc_rule_areas.cpp
index 514b97d3ea..58149cb266 100644
--- a/qa/tests/eeschema/erc/test_erc_rule_areas.cpp
+++ b/qa/tests/eeschema/erc/test_erc_rule_areas.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <sch_rule_area.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
diff --git a/qa/tests/eeschema/erc/test_erc_stacking_pins.cpp b/qa/tests/eeschema/erc/test_erc_stacking_pins.cpp
index 14f93da386..f3ca962d33 100644
--- a/qa/tests/eeschema/erc/test_erc_stacking_pins.cpp
+++ b/qa/tests/eeschema/erc/test_erc_stacking_pins.cpp
@@ -23,9 +23,9 @@
 
 #include <connection_graph.h>
 #include <schematic.h>
-#include <erc_settings.h>
-#include <erc.h>
-#include <erc_report.h>
+#include <erc/erc_settings.h>
+#include <erc/erc.h>
+#include <erc/erc_report.h>
 #include <settings/settings_manager.h>
 #include <locale_io.h>
 
diff --git a/qa/tests/eeschema/test_ee_item.cpp b/qa/tests/eeschema/test_ee_item.cpp
index d1011672cd..7c48b93e6d 100644
--- a/qa/tests/eeschema/test_ee_item.cpp
+++ b/qa/tests/eeschema/test_ee_item.cpp
@@ -46,7 +46,7 @@
 #include <sch_sheet.h>
 #include <sch_pin.h>
 
-#include <erc_settings.h>
+#include <erc/erc_settings.h>
 
 class TEST_EE_ITEM_FIXTURE
 {