diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 38da6eb561..44df6cb8a2 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -287,12 +287,6 @@ set( COMMON_SRCS
     ${PLUGINS_CADSTAR_SRCS}
     ${PLUGINS_EAGLE_SRCS}
 	${FONT_SRCS}
-    cli/command_export_pcb_base.cpp
-    cli/command_export_pcb_dxf.cpp
-    cli/command_export_pcb_step.cpp
-    cli/command_export_pcb_svg.cpp
-    cli/command_pcb.cpp
-    cli/command_pcb_export.cpp
     jobs/job_dispatcher.cpp
     advanced_config.cpp
     array_axis.cpp
diff --git a/common/cli/exit_codes.h b/include/cli/exit_codes.h
similarity index 100%
rename from common/cli/exit_codes.h
rename to include/cli/exit_codes.h
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index a101e4c12b..b548b2385a 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -16,6 +16,12 @@ include_directories(
     )
 
 set( KICAD_SRCS
+    cli/command_export_pcb_base.cpp
+    cli/command_export_pcb_dxf.cpp
+    cli/command_export_pcb_step.cpp
+    cli/command_export_pcb_svg.cpp
+    cli/command_pcb.cpp
+    cli/command_pcb_export.cpp
     dialogs/dialog_template_selector_base.cpp
     dialogs/dialog_template_selector.cpp
     dialogs/panel_kicad_launcher_base.cpp
diff --git a/common/cli/command.h b/kicad/cli/command.h
similarity index 100%
rename from common/cli/command.h
rename to kicad/cli/command.h
diff --git a/common/cli/command_export_pcb_base.cpp b/kicad/cli/command_export_pcb_base.cpp
similarity index 96%
rename from common/cli/command_export_pcb_base.cpp
rename to kicad/cli/command_export_pcb_base.cpp
index 893b66865a..c109eff12b 100644
--- a/common/cli/command_export_pcb_base.cpp
+++ b/kicad/cli/command_export_pcb_base.cpp
@@ -2,7 +2,6 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2022 Mark Roszko <mark.roszko@gmail.com>
- * Copyright (C) 2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
  * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -20,7 +19,7 @@
  */
 
 #include "command_export_pcb_base.h"
-#include "exit_codes.h"
+#include <cli/exit_codes.h>
 #include <kiface_base.h>
 
 #include <macros.h>
diff --git a/common/cli/command_export_pcb_base.h b/kicad/cli/command_export_pcb_base.h
similarity index 100%
rename from common/cli/command_export_pcb_base.h
rename to kicad/cli/command_export_pcb_base.h
diff --git a/common/cli/command_export_pcb_dxf.cpp b/kicad/cli/command_export_pcb_dxf.cpp
similarity index 97%
rename from common/cli/command_export_pcb_dxf.cpp
rename to kicad/cli/command_export_pcb_dxf.cpp
index 7621a4250d..c0e2b58370 100644
--- a/common/cli/command_export_pcb_dxf.cpp
+++ b/kicad/cli/command_export_pcb_dxf.cpp
@@ -2,7 +2,6 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2022 Mark Roszko <mark.roszko@gmail.com>
- * Copyright (C) 2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
  * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -20,7 +19,7 @@
  */
 
 #include "command_export_pcb_dxf.h"
-#include "exit_codes.h"
+#include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_dxf.h"
 #include <kiface_base.h>
 #include <layer_ids.h>
diff --git a/common/cli/command_export_pcb_dxf.h b/kicad/cli/command_export_pcb_dxf.h
similarity index 100%
rename from common/cli/command_export_pcb_dxf.h
rename to kicad/cli/command_export_pcb_dxf.h
diff --git a/common/cli/command_export_pcb_step.cpp b/kicad/cli/command_export_pcb_step.cpp
similarity index 98%
rename from common/cli/command_export_pcb_step.cpp
rename to kicad/cli/command_export_pcb_step.cpp
index 9801d5cdb1..6bd44c16dd 100644
--- a/common/cli/command_export_pcb_step.cpp
+++ b/kicad/cli/command_export_pcb_step.cpp
@@ -2,7 +2,6 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2022 Mark Roszko <mark.roszko@gmail.com>
- * Copyright (C) 2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
  * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -20,7 +19,7 @@
  */
 
 #include "command_export_pcb_step.h"
-#include "exit_codes.h"
+#include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_step.h"
 #include <kiface_base.h>
 #include <regex>
diff --git a/common/cli/command_export_pcb_step.h b/kicad/cli/command_export_pcb_step.h
similarity index 100%
rename from common/cli/command_export_pcb_step.h
rename to kicad/cli/command_export_pcb_step.h
diff --git a/common/cli/command_export_pcb_svg.cpp b/kicad/cli/command_export_pcb_svg.cpp
similarity index 99%
rename from common/cli/command_export_pcb_svg.cpp
rename to kicad/cli/command_export_pcb_svg.cpp
index 7e874032c6..670d8bd109 100644
--- a/common/cli/command_export_pcb_svg.cpp
+++ b/kicad/cli/command_export_pcb_svg.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "command_export_pcb_svg.h"
-#include "exit_codes.h"
+#include <cli/exit_codes.h>
 #include "jobs/job_export_pcb_svg.h"
 #include <kiface_base.h>
 #include <layer_ids.h>
diff --git a/common/cli/command_export_pcb_svg.h b/kicad/cli/command_export_pcb_svg.h
similarity index 100%
rename from common/cli/command_export_pcb_svg.h
rename to kicad/cli/command_export_pcb_svg.h
diff --git a/common/cli/command_pcb.cpp b/kicad/cli/command_pcb.cpp
similarity index 100%
rename from common/cli/command_pcb.cpp
rename to kicad/cli/command_pcb.cpp
diff --git a/common/cli/command_pcb.h b/kicad/cli/command_pcb.h
similarity index 100%
rename from common/cli/command_pcb.h
rename to kicad/cli/command_pcb.h
diff --git a/common/cli/command_pcb_export.cpp b/kicad/cli/command_pcb_export.cpp
similarity index 100%
rename from common/cli/command_pcb_export.cpp
rename to kicad/cli/command_pcb_export.cpp
diff --git a/common/cli/command_pcb_export.h b/kicad/cli/command_pcb_export.h
similarity index 100%
rename from common/cli/command_pcb_export.h
rename to kicad/cli/command_pcb_export.h