diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 5c1eaae669..b939f8914b 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -527,9 +527,9 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/io_mgr.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/kicad_clipboard.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/kicad_netlist_reader.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/kicad_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/kicad/kicad_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/legacy_netlist_reader.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/legacy_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/legacy/legacy_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/netlist_reader.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pad_custom_shape_functions.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_display_options.cpp
@@ -537,7 +537,7 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/pcb_netlist.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_origin_transforms.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_painter.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_parser.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/kicad/pcb_parser.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_plot_params.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_screen.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_view.cpp
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index efcc5f4c7e..329d4ca37a 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -212,7 +212,7 @@ set( EESCHEMA_SRCS
     sch_io_mgr.cpp
     sch_item.cpp
     sch_junction.cpp
-    sch_legacy_plugin.cpp
+    sch_plugins/legacy/sch_legacy_plugin.cpp
     sch_line.cpp
     sch_marker.cpp
     sch_no_connect.cpp
@@ -220,8 +220,8 @@ set( EESCHEMA_SRCS
     sch_plugin.cpp
     sch_preview_panel.cpp
     sch_screen.cpp
-    sch_sexpr_parser.cpp
-    sch_sexpr_plugin.cpp
+    sch_plugins/kicad/sch_sexpr_parser.cpp
+    sch_plugins/kicad/sch_sexpr_plugin.cpp
     sch_sheet.cpp
     sch_sheet_path.cpp
     sch_sheet_pin.cpp
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 31be0c2d39..5e0b11c55e 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -43,7 +43,7 @@
 
 #include <general.h>
 #include <class_library.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 
 #include <wx/progdlg.h>
 #include <wx/tokenzr.h>
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 3919178c8f..5b692e13ce 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -43,7 +43,7 @@
 #include <richio.h>
 #include <sch_component.h>
 #include <sch_edit_frame.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
diff --git a/eeschema/libedit/lib_manager.cpp b/eeschema/libedit/lib_manager.cpp
index 4338ad8416..83abc26ae1 100644
--- a/eeschema/libedit/lib_manager.cpp
+++ b/eeschema/libedit/lib_manager.cpp
@@ -32,7 +32,7 @@
 #include <kiway.h>
 #include <profile.h>
 #include <sch_io_mgr.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <symbol_lib_table.h>
 #include <list>
 
diff --git a/eeschema/libedit/libedit.cpp b/eeschema/libedit/libedit.cpp
index f5c7e01396..fba1cef354 100644
--- a/eeschema/libedit/libedit.cpp
+++ b/eeschema/libedit/libedit.cpp
@@ -38,8 +38,8 @@
 #include <lib_manager.h>
 #include <symbol_tree_pane.h>
 #include <widgets/lib_tree.h>
-#include <sch_legacy_plugin.h>
-#include <sch_sexpr_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
+#include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <dialogs/dialog_lib_new_component.h>
 #include <dialog_helpers.h>
 #include <wx/clipbrd.h>
diff --git a/eeschema/libedit/symbedit.cpp b/eeschema/libedit/symbedit.cpp
index 9dbc3715a4..88b976a1e3 100644
--- a/eeschema/libedit/symbedit.cpp
+++ b/eeschema/libedit/symbedit.cpp
@@ -33,7 +33,7 @@
 #include <lib_edit_frame.h>
 #include <class_libentry.h>
 #include <wildcards_and_files_ext.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <properties.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
diff --git a/eeschema/project_rescue.h b/eeschema/project_rescue.h
index 1fa3d6a20b..7906a618e4 100644
--- a/eeschema/project_rescue.h
+++ b/eeschema/project_rescue.h
@@ -43,7 +43,7 @@
 
 #include <properties.h>
 #include <class_libentry.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <class_draw_panel_gal.h>
 
 
diff --git a/eeschema/sch_io_mgr.cpp b/eeschema/sch_io_mgr.cpp
index 095819e43d..e32846ca4a 100644
--- a/eeschema/sch_io_mgr.cpp
+++ b/eeschema/sch_io_mgr.cpp
@@ -24,9 +24,9 @@
 #include <wx/uri.h>
 
 #include <sch_io_mgr.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <sch_plugins/eagle/sch_eagle_plugin.h>
-#include <sch_sexpr_plugin.h>
+#include <sch_plugins/kicad/sch_sexpr_plugin.h>
 
 #include <sch_plugins/altium/sch_altium_plugin.h>
 #include <sch_plugins/cadstar/cadstar_sch_archive_plugin.h>
diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
index d6b1d0f8a3..149d2c3c80 100644
--- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
+++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
@@ -50,7 +50,7 @@
 #include <memory>
 #include <compoundfilereader.h>
 #include <plugins/altium/altium_parser.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/textfile.h>
 
diff --git a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index 9e57ad7bf6..f6386b54af 100644
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -51,7 +51,7 @@
 #include <project/net_settings.h>
 #include <sch_edit_frame.h>
 #include <sch_junction.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <sch_marker.h>
 #include <sch_screen.h>
 #include <sch_sheet.h>
diff --git a/eeschema/sch_sexpr_parser.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
similarity index 99%
rename from eeschema/sch_sexpr_parser.cpp
rename to eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
index 66c09de325..45fa8e6835 100644
--- a/eeschema/sch_sexpr_parser.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
@@ -51,7 +51,7 @@
 #include <sch_junction.h>
 #include <sch_no_connect.h>
 #include <sch_screen.h>
-#include <sch_sexpr_parser.h>
+#include <sch_plugins/kicad/sch_sexpr_parser.h>
 #include <template_fieldnames.h>
 
 
diff --git a/eeschema/sch_sexpr_parser.h b/eeschema/sch_plugins/kicad/sch_sexpr_parser.h
similarity index 100%
rename from eeschema/sch_sexpr_parser.h
rename to eeschema/sch_plugins/kicad/sch_sexpr_parser.h
diff --git a/eeschema/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
similarity index 99%
rename from eeschema/sch_sexpr_plugin.cpp
rename to eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index 47a77502ed..bd2bc24512 100644
--- a/eeschema/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -40,7 +40,7 @@
 #include <sch_iref.h>
 #include <sch_sheet.h>
 #include <schematic.h>
-#include <sch_sexpr_plugin.h>
+#include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <sch_screen.h>
 #include <class_libentry.h>
 #include <class_library.h>
@@ -55,7 +55,7 @@
 #include <eeschema_id.h>       // for MAX_UNIT_COUNT_PER_PACKAGE definition
 #include <sch_file_versions.h>
 #include <schematic_lexer.h>
-#include <sch_sexpr_parser.h>
+#include <sch_plugins/kicad/sch_sexpr_parser.h>
 #include <symbol_lib_table.h>  // for PropPowerSymsOnly definintion.
 #include <ee_selection.h>
 
diff --git a/eeschema/sch_sexpr_plugin.h b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.h
similarity index 100%
rename from eeschema/sch_sexpr_plugin.h
rename to eeschema/sch_plugins/kicad/sch_sexpr_plugin.h
diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
similarity index 99%
rename from eeschema/sch_legacy_plugin.cpp
rename to eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index 9cf90f6e3b..64d5368c44 100644
--- a/eeschema/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -50,7 +50,7 @@
 #include <sch_sheet.h>
 #include <sch_bitmap.h>
 #include <bus_alias.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <template_fieldnames.h>
 #include <sch_screen.h>
 #include <schematic.h>
diff --git a/eeschema/sch_legacy_plugin.h b/eeschema/sch_plugins/legacy/sch_legacy_plugin.h
similarity index 100%
rename from eeschema/sch_legacy_plugin.h
rename to eeschema/sch_plugins/legacy/sch_legacy_plugin.h
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index dad92b6b7e..f5e208f658 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -30,7 +30,7 @@
 #include <tool/tool_manager.h>
 #include <wx/clipbrd.h>
 #include <sch_edit_frame.h>
-#include <sch_legacy_plugin.h>
+#include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <sch_view.h>
diff --git a/eeschema/tools/lib_edit_tool.cpp b/eeschema/tools/lib_edit_tool.cpp
index cf90b4f19b..7b8068a968 100644
--- a/eeschema/tools/lib_edit_tool.cpp
+++ b/eeschema/tools/lib_edit_tool.cpp
@@ -38,7 +38,7 @@
 #include <dialogs/dialog_edit_one_field.h>
 #include <dialogs/dialog_edit_component_in_lib.h>
 #include <dialogs/dialog_lib_edit_pin_table.h>
-#include <sch_sexpr_plugin.h>
+#include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <lib_text.h>
 #include "lib_edit_tool.h"
 #include <math/util.h>      // for KiROUND
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index 55aa99e971..cf4c9d4bec 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -39,7 +39,7 @@
 #include <project/project_file.h>
 #include <project/net_settings.h>
 #include <sch_edit_frame.h>
-#include <sch_sexpr_plugin.h>
+#include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <sch_line.h>
 #include <sch_painter.h>
 #include <sch_sheet.h>
diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
index c22678532e..30b3edd928 100644
--- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
@@ -33,7 +33,7 @@
 #include <ws_proxy_view_item.h>
 #include <pcb_painter.h>
 #include <class_track.h>
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 
 
 std::string g_previewBoard =
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index e1aba23008..ff520adaf7 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -46,7 +46,7 @@
 #include <footprint_tree_pane.h>
 #include <footprint_viewer_frame.h>
 #include <fp_lib_table.h>
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
 #include <kiway.h>
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index 94962abacd..26c1a7c910 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -39,8 +39,8 @@
 #include <board_commit.h>
 #include <footprint_edit_frame.h>
 #include <wildcards_and_files_ext.h>
-#include <kicad_plugin.h>
-#include <legacy_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
+#include <plugins/legacy/legacy_plugin.h>
 #include <env_paths.h>
 #include <settings/settings_manager.h>
 #include <footprint_editor_settings.h>
diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index 3d8fb0090b..44809bd80c 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -81,7 +81,7 @@ Vary: Accept-Encoding
 
 #include <io_mgr.h>
 #include <richio.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <class_board.h>
 #include <github_plugin.h>
 #include <class_module.h>
diff --git a/pcbnew/github/github_plugin.h b/pcbnew/github/github_plugin.h
index 232babdfda..9004748c0b 100644
--- a/pcbnew/github/github_plugin.h
+++ b/pcbnew/github/github_plugin.h
@@ -25,7 +25,7 @@
 #ifndef GITHUB_PLUGIN_H_
 #define GITHUB_PLUGIN_H_
 
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 
 struct GH_CACHE;
 
diff --git a/pcbnew/io_mgr.cpp b/pcbnew/io_mgr.cpp
index e8e52cd777..7467e1edb0 100644
--- a/pcbnew/io_mgr.cpp
+++ b/pcbnew/io_mgr.cpp
@@ -29,8 +29,8 @@
 #include <plugins/eagle/eagle_plugin.h>
 #include <plugins/geda/gpcb_plugin.h>
 #include <io_mgr.h>
-#include <kicad_plugin.h>
-#include <legacy_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
+#include <plugins/legacy/legacy_plugin.h>
 #include <plugins/pcad/pcad_plugin.h>
 #include <plugins/altium/altium_circuit_maker_plugin.h>
 #include <plugins/altium/altium_circuit_studio_plugin.h>
diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp
index 413b917738..500a52e682 100644
--- a/pcbnew/kicad_clipboard.cpp
+++ b/pcbnew/kicad_clipboard.cpp
@@ -32,9 +32,9 @@
 #include <fp_text.h>
 #include <common.h>
 #include <netinfo.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/pcb_parser.h>
 
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 #include <kicad_clipboard.h>
 
 CLIPBOARD_IO::CLIPBOARD_IO():
diff --git a/pcbnew/kicad_clipboard.h b/pcbnew/kicad_clipboard.h
index 75af2e7aff..0d4f0e870c 100644
--- a/pcbnew/kicad_clipboard.h
+++ b/pcbnew/kicad_clipboard.h
@@ -30,10 +30,10 @@
 #ifndef KICAD_CLIPBOARD_H
 #define KICAD_CLIPBOARD_H
 
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 #include <class_board_item.h>
 #include <class_module.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <memory.h>
 #include <tools/pcbnew_selection.h>
 
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/plugins/kicad/kicad_plugin.cpp
similarity index 99%
rename from pcbnew/kicad_plugin.cpp
rename to pcbnew/plugins/kicad/kicad_plugin.cpp
index 0ed8c43cf2..04d27e6f79 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/plugins/kicad/kicad_plugin.cpp
@@ -38,8 +38,8 @@
 #include <fp_shape.h>
 #include <confirm.h>
 #include <zones.h>
-#include <kicad_plugin.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/kicad_plugin.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <pcbnew_settings.h>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <convert_basic_shapes_to_polygon.h>    // for enum RECT_CHAMFER_POSITIONS definition
diff --git a/pcbnew/kicad_plugin.h b/pcbnew/plugins/kicad/kicad_plugin.h
similarity index 100%
rename from pcbnew/kicad_plugin.h
rename to pcbnew/plugins/kicad/kicad_plugin.h
diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp
similarity index 99%
rename from pcbnew/pcb_parser.cpp
rename to pcbnew/plugins/kicad/pcb_parser.cpp
index c677529b61..d0fe626343 100644
--- a/pcbnew/pcb_parser.cpp
+++ b/pcbnew/plugins/kicad/pcb_parser.cpp
@@ -46,11 +46,11 @@
 #include <class_pad.h>
 #include <class_track.h>
 #include <class_zone.h>
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 #include <pcb_plot_params_parser.h>
 #include <pcb_plot_params.h>
 #include <zones.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <convert_basic_shapes_to_polygon.h>    // for RECT_CHAMFER_POSITIONS definition
 #include <template_fieldnames.h>
 
diff --git a/pcbnew/pcb_parser.h b/pcbnew/plugins/kicad/pcb_parser.h
similarity index 100%
rename from pcbnew/pcb_parser.h
rename to pcbnew/plugins/kicad/pcb_parser.h
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/plugins/legacy/legacy_plugin.cpp
similarity index 99%
rename from pcbnew/legacy_plugin.cpp
rename to pcbnew/plugins/legacy/legacy_plugin.cpp
index c5bd202804..63535c7bb9 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/plugins/legacy/legacy_plugin.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <cstdio>
 #include <cstring>
-#include <legacy_plugin.h>   // implement this here
+#include <plugins/legacy/legacy_plugin.h>   // implement this here
 #include <wx/ffile.h>
 #include <wx/string.h>
 
diff --git a/pcbnew/legacy_plugin.h b/pcbnew/plugins/legacy/legacy_plugin.h
similarity index 100%
rename from pcbnew/legacy_plugin.h
rename to pcbnew/plugins/legacy/legacy_plugin.h
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 92bc4d76eb..178ca4d864 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -50,7 +50,7 @@ using namespace std::placeholders;
 #include "pns_kicad_iface.h"
 
 #ifdef DEBUG
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 #endif
 
 using namespace KIGFX;
diff --git a/pcbnew/swig/pcbnew.i b/pcbnew/swig/pcbnew.i
index 7adf509d98..150788cabd 100644
--- a/pcbnew/swig/pcbnew.i
+++ b/pcbnew/swig/pcbnew.i
@@ -105,9 +105,9 @@ HANDLE_EXCEPTIONS(PLUGIN::FootprintEnumerate)
 HANDLE_EXCEPTIONS(PLUGIN::FootprintLoad)
 HANDLE_EXCEPTIONS(PLUGIN::FootprintSave)
 HANDLE_EXCEPTIONS(PLUGIN::FootprintDelete)
-%include <kicad_plugin.h>
+%include <plugins/kicad/kicad_plugin.h>
 %{
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 %}
 
 
diff --git a/pcbnew/tools/pcbnew_selection.cpp b/pcbnew/tools/pcbnew_selection.cpp
index b103631350..7311c967db 100644
--- a/pcbnew/tools/pcbnew_selection.cpp
+++ b/pcbnew/tools/pcbnew_selection.cpp
@@ -49,7 +49,7 @@ using namespace std::placeholders;
 #include "pcb_bright_box.h"
 #include "pcb_actions.h"
 
-#include "kicad_plugin.h"
+#include "plugins/kicad/kicad_plugin.h"
 
 
 
diff --git a/qa/libeval_compiler/libeval_compiler_test.cpp b/qa/libeval_compiler/libeval_compiler_test.cpp
index 620b8f7cef..bfc4c8f28f 100644
--- a/qa/libeval_compiler/libeval_compiler_test.cpp
+++ b/qa/libeval_compiler/libeval_compiler_test.cpp
@@ -7,7 +7,7 @@
 #include <pcb_expr_evaluator.h>
 
 #include <io_mgr.h>
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 
 #include <unordered_set>
 
diff --git a/qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp b/qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
index 7978c2d73a..c7df0461d7 100644
--- a/qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
+++ b/qa/pcbnew_tools/tools/pcb_parser/pcb_parser_tool.cpp
@@ -32,8 +32,8 @@
 #include <wx/cmdline.h>
 
 #include <class_board_item.h>
-#include <kicad_plugin.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/kicad_plugin.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <richio.h>
 
 #include <wx/cmdline.h>
diff --git a/qa/pcbnew_utils/board_file_utils.cpp b/qa/pcbnew_utils/board_file_utils.cpp
index 95fc3386e7..e35a2cb593 100644
--- a/qa/pcbnew_utils/board_file_utils.cpp
+++ b/qa/pcbnew_utils/board_file_utils.cpp
@@ -24,8 +24,8 @@
 #include <pcbnew_utils/board_file_utils.h>
 
 // For PCB parsing
-#include <kicad_plugin.h>
-#include <pcb_parser.h>
+#include <plugins/kicad/kicad_plugin.h>
+#include <plugins/kicad/pcb_parser.h>
 #include <richio.h>
 
 #include <class_board.h>
diff --git a/qa/qa_utils/pcb_test_frame.cpp b/qa/qa_utils/pcb_test_frame.cpp
index 7c84facf6a..ba20aa10ba 100644
--- a/qa/qa_utils/pcb_test_frame.cpp
+++ b/qa/qa_utils/pcb_test_frame.cpp
@@ -64,7 +64,7 @@
 #include <tools/pcb_tool_base.h>
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>
-#include <kicad_plugin.h>
+#include <plugins/kicad/kicad_plugin.h>
 
 #include "pcb_test_frame.h"