diff --git a/Makefile.common b/Makefile.common
index 55e0b31ee8..da242adb5f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -199,6 +199,7 @@ OBJ += frontend/frontend.o \
        dynamic.o \
        cores/dynamic_dummy.o \
        $(LIBRETRO_COMM_DIR)/queues/message_queue.o \
+		 managers/core_manager.o \
        managers/state_manager.o \
        gfx/drivers_font_renderer/bitmapfont.o \
        tasks/task_autodetect.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 4a7f9632d9..834ab35f58 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -121,6 +121,7 @@ CONFIG FILE
 
 #include "../libretro-common/file/config_file.c"
 #include "../libretro-common/file/config_file_userdata.c"
+#include "../managers/core_manager.c"
 #include "../managers/core_option_manager.c"
 
 /*============================================================
diff --git a/managers/core_manager.c b/managers/core_manager.c
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/managers/core_manager.h b/managers/core_manager.h
new file mode 100644
index 0000000000..dc451282b3
--- /dev/null
+++ b/managers/core_manager.h
@@ -0,0 +1,29 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CORE_MANAGER_H
+#define __CORE_MANAGER_H
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+
+
+RETRO_END_DECLS
+
+#endif