diff --git a/Makefile.common b/Makefile.common
index 52aad9b2cf..9ee8934c3a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -132,6 +132,7 @@ OBJ += frontend/frontend.o \
        ui/drivers/null/ui_null_application.o \
        core_impl.o \
        retroarch.o \
+		 dirs.o \
 		 paths.o \
        input/input_keyboard.o \
        command.o \
diff --git a/dirs.c b/dirs.c
new file mode 100644
index 0000000000..3db92fb660
--- /dev/null
+++ b/dirs.c
@@ -0,0 +1,28 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - 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/>.
+ */
+
+#include <retro_miscellaneous.h>
+#include <compat/strl.h>
+#include <file/file_path.h>
+#include <lists/string_list.h>
+#include <string/stdstring.h>
+#include <retro_assert.h>
+#include <retro_stat.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "dirs.h"
diff --git a/dirs.h b/dirs.h
new file mode 100644
index 0000000000..b1e01582ae
--- /dev/null
+++ b/dirs.h
@@ -0,0 +1,26 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - 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 __DIRS_H
+#define __DIRS_H
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+RETRO_END_DECLS
+
+#endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 939740d40c..248e56f934 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -797,6 +797,7 @@ RETROARCH
 ============================================================ */
 #include "../core_impl.c"
 #include "../retroarch.c"
+#include "../dirs.c"
 #include "../paths.c"
 #include "../runloop.c"
 #include "../libretro-common/queues/task_queue.c"