diff --git a/Makefile.common b/Makefile.common
index 878861a62b..7f1545950d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -116,7 +116,7 @@ endif
 GIT_VERSION := $(shell git rev-parse --short HEAD 2>/dev/null)
 ifneq ($(GIT_VERSION),)
    DEFINES += -DHAVE_GIT_VERSION -DGIT_VERSION=$(GIT_VERSION)
-   OBJ += git_version.o
+   OBJ += version_git.o
 endif
 
 # General object files
diff --git a/general.h b/general.h
index 2aacfa3f8e..009ef7c4e6 100644
--- a/general.h
+++ b/general.h
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "1.3.6"
-#endif
+#include "version.h"
 
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 294037a2cc..b6120bae55 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -782,7 +782,7 @@ GIT
 ============================================================ */
 
 #ifdef HAVE_GIT_VERSION
-#include "../git_version.c"
+#include "../version_git.c"
 #endif
 
 
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index be2f22a08c..5fd90cfe3d 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -23,6 +23,7 @@
 
 #include <string/stdstring.h>
 #include <lists/string_list.h>
+#include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <encodings/utf.h>
 #include <file/file_path.h>
@@ -32,13 +33,13 @@
 
 #include "menu_generic.h"
 
-#include "../../general.h"
-
 #include "../menu_driver.h"
 #include "../menu_animation.h"
 #include "../menu_display.h"
 #include "../menu_navigation.h"
 
+#include "../../configuration.h"
+#include "../../runloop.h"
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
 #define RGUI_TERM_START_X(width)        (width / 21)
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index e6c4637f27..227ed5a403 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -46,7 +46,7 @@
 #include "../ui/ui_companion_driver.h"
 #include "../gfx/video_shader_driver.h"
 #include "../config.features.h"
-#include "../git_version.h"
+#include "../version_git.h"
 #include "../input/input_config.h"
 #include "../list_special.h"
 #include "../performance_counters.h"
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index bb99537935..b7dbe2e9b4 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -17,14 +17,17 @@
 #include <string.h>
 
 #include <retro_inline.h>
+#include <compat/strl.h>
 #include <string/stdstring.h>
 
 #include "menu_driver.h"
 #include "menu_cbs.h"
 #include "menu_navigation.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../runloop.h"
 #include "../system.h"
+#include "../version.h"
 
 struct menu_list
 {
diff --git a/retroarch.c b/retroarch.c
index b080322017..9b92085b2f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -59,13 +59,13 @@
 #include "record/record_driver.h"
 #include "core.h"
 #include "configuration.h"
-#include "general.h"
 #include "runloop.h"
 #include "managers/cheat_manager.h"
 #include "system.h"
 #include "tasks/tasks_internal.h"
 
-#include "git_version.h"
+#include "version.h"
+#include "version_git.h"
 
 #include "retroarch.h"
 
diff --git a/version.h b/version.h
new file mode 100644
index 0000000000..790cb986cc
--- /dev/null
+++ b/version.h
@@ -0,0 +1,24 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  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 RARCH_VERSION_H__
+#define RARCH_VERSION_H__
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "1.3.6"
+#endif
+
+#endif
diff --git a/git_version.c b/version_git.c
similarity index 97%
rename from git_version.c
rename to version_git.c
index 3d7a62109e..fb463b664c 100644
--- a/git_version.c
+++ b/version_git.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "git_version.h"
+#include "version_git.h"
 #define STR_(x) #x
 #define STR(x) STR_(x)
 const char retroarch_git_version[] = STR(GIT_VERSION);
diff --git a/git_version.h b/version_git.h
similarity index 94%
rename from git_version.h
rename to version_git.h
index 3e12706304..9222043f78 100644
--- a/git_version.h
+++ b/version_git.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RARCH_VERSION_H__
-#define RARCH_VERSION_H__
+#ifndef RARCH_VERSION_GIT_H__
+#define RARCH_VERSION_GIT_H__
 
 #include <retro_common_api.h>