diff --git a/eeschema/eeschema_jobs_handler.cpp b/eeschema/eeschema_jobs_handler.cpp
index 56af04be63..628e90720c 100644
--- a/eeschema/eeschema_jobs_handler.cpp
+++ b/eeschema/eeschema_jobs_handler.cpp
@@ -40,6 +40,7 @@
 #include <wildcards_and_files_ext.h>
 #include <plotters/plotters_pslike.h>
 #include <drawing_sheet/ds_data_model.h>
+#include <reporter.h>
 
 #include <settings/settings_manager.h>
 
@@ -661,8 +662,9 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
     {
         if( wxFile::Exists( upgradeJob->m_outputLibraryPath ) )
         {
-            m_reporter->Report(
-                    _( "Output path must not conflict with existing path\n", RPT_SEVERITY_ERROR ) );
+            m_reporter->Report( _( "Output path must not conflict with existing path\n" ),
+                                RPT_SEVERITY_ERROR );
+
             return CLI::EXIT_CODES::ERR_INVALID_OUTPUT_CONFLICT;
         }
     }
@@ -672,7 +674,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
 
     if( shouldSave )
     {
-        m_reporter->Report( _( "Saving symbol library in updated format\n", RPT_SEVERITY_ACTION ) );
+        m_reporter->Report( _( "Saving symbol library in updated format\n" ), RPT_SEVERITY_ACTION );
 
         try
         {
diff --git a/eeschema/eeschema_jobs_handler.h b/eeschema/eeschema_jobs_handler.h
index 29418b6f91..bf4ac174b7 100644
--- a/eeschema/eeschema_jobs_handler.h
+++ b/eeschema/eeschema_jobs_handler.h
@@ -23,7 +23,6 @@
 
 #include <jobs/job_dispatcher.h>
 #include <wx/string.h>
-#include <reporter.h>
 
 namespace KIGFX
 {
@@ -48,8 +47,6 @@ public:
     int JobSymUpgrade( JOB* aJob );
     int JobSymExportSvg( JOB* aJob );
 
-    int doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob, KIGFX::SCH_RENDER_SETTINGS* aRenderSettings, LIB_SYMBOL* symbol );
-
     /**
      * Configures the SCH_RENDER_SETTINGS object with the correct data to be used with plotting
      *
@@ -62,6 +59,10 @@ public:
     void InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRenderSettings, const wxString& aTheme,
                              SCHEMATIC* aSch );
 
+private:
+    int doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob, KIGFX::SCH_RENDER_SETTINGS* aRenderSettings,
+                        LIB_SYMBOL* symbol );
+
 };
 
 #endif
diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp
index b389a84c07..6f553ef8ea 100644
--- a/pcbnew/pcbnew_jobs_handler.cpp
+++ b/pcbnew/pcbnew_jobs_handler.cpp
@@ -48,6 +48,7 @@
 #include <wildcards_and_files_ext.h>
 #include <plugins/kicad/pcb_plugin.h>
 #include <gerber_jobfile_writer.h>
+#include <reporter.h>
 
 #include "pcbnew_scripting_helpers.h"
 
diff --git a/pcbnew/pcbnew_jobs_handler.h b/pcbnew/pcbnew_jobs_handler.h
index ff28ae9223..a0de415a5a 100644
--- a/pcbnew/pcbnew_jobs_handler.h
+++ b/pcbnew/pcbnew_jobs_handler.h
@@ -23,7 +23,6 @@
 
 #include <jobs/job_dispatcher.h>
 #include <pcb_plot_params.h>
-#include <reporter.h>
 
 class JOB_EXPORT_PCB_GERBER;
 class JOB_FP_EXPORT_SVG;