diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
index b86cefcc4f5..c002c469979 100644
--- a/core/src/dird/dird_conf.cc
+++ b/core/src/dird/dird_conf.cc
@@ -54,6 +54,7 @@
 #include "dird/jcr_private.h"
 #include "include/auth_protocol_types.h"
 #include "include/auth_types.h"
+#include "include/migration_selection_types.h"
 #include "include/protocol_types.h"
 #include "lib/berrno.h"
 #include "lib/breg.h"
diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc
index b62cc1c729c..530d7b578fa 100644
--- a/core/src/dird/migrate.cc
+++ b/core/src/dird/migrate.cc
@@ -53,6 +53,7 @@
 #include "dird/ua_purge.h"
 #include "dird/ua_run.h"
 #include "include/auth_protocol_types.h"
+#include "include/migration_selection_types.h"
 #include "lib/edit.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
index 3be99c56ff8..060e66027dd 100644
--- a/core/src/include/jcr.h
+++ b/core/src/include/jcr.h
@@ -49,23 +49,6 @@ typedef struct s_tree_root TREE_ROOT;
 #include "lib/alist.h"
 #include "lib/volume_session_info.h"
 
-class dlist;
-
-/**
- * Migration selection types
- */
-enum
-{
-  MT_SMALLEST_VOL = 1,
-  MT_OLDEST_VOL,
-  MT_POOL_OCCUPANCY,
-  MT_POOL_TIME,
-  MT_POOL_UNCOPIED_JOBS,
-  MT_CLIENT,
-  MT_VOLUME,
-  MT_JOB,
-  MT_SQLQUERY
-};
 
 #define JobTerminatedSuccessfully(jcr) \
   (jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings)
@@ -79,6 +62,7 @@ enum
 
 #define endeach_jcr(jcr) JcrWalkEnd(jcr)
 
+class dlist;
 class JobControlRecord;
 class BareosSocket;
 class BareosDb;
diff --git a/core/src/include/migration_selection_types.h b/core/src/include/migration_selection_types.h
new file mode 100644
index 00000000000..4076db4b6a9
--- /dev/null
+++ b/core/src/include/migration_selection_types.h
@@ -0,0 +1,40 @@
+/*
+   BAREOS® - Backup Archiving REcovery Open Sourced
+
+   Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
+   Copyright (C) 2011-2012 Planets Communications B.V.
+   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
+#ifndef BAREOS_SRC_INCLUDE_MIGRATION_SELECTION_TYPES_H_
+#define BAREOS_SRC_INCLUDE_MIGRATION_SELECTION_TYPES_H_
+
+enum MigrationSelectionTypes
+{
+  MT_SMALLEST_VOL = 1,
+  MT_OLDEST_VOL,
+  MT_POOL_OCCUPANCY,
+  MT_POOL_TIME,
+  MT_POOL_UNCOPIED_JOBS,
+  MT_CLIENT,
+  MT_VOLUME,
+  MT_JOB,
+  MT_SQLQUERY
+};
+
+#endif  // BAREOS_SRC_INCLUDE_MIGRATION_SELECTION_TYPES_H_