From 5357a17bac1a3e4070e1529be1eaae57a48ed524 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Thu, 24 Jul 2014 13:04:35 +0200
Subject: Don't include cmake_config_githash.h into files that don't need it

---
 src/config.h         | 6 ------
 src/convert_json.cpp | 1 -
 src/version.h        | 5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/config.h b/src/config.h
index 54c13d440..510c5ef1e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -74,11 +74,5 @@
 	#define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING
 #endif
 
-#ifdef __ANDROID__
-	#include "android_version.h"
-#else
-	#include "cmake_config_githash.h"
-#endif
-
 #endif
 
diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index e79103a16..c5c69d93c 100644
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -27,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "main.h" // for g_settings
 #include "settings.h"
-#include "version.h"
 #include "httpfetch.h"
 #include "porting.h"
 
diff --git a/src/version.h b/src/version.h
index 0143d91a4..6a10a9d43 100644
--- a/src/version.h
+++ b/src/version.h
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define VERSION_HEADER
 
 #include "config.h"
+#ifdef __ANDROID__
+	#include "android_version.h"
+#else
+	#include "cmake_config_githash.h"
+#endif
 
 extern const char *minetest_version_simple;
 extern const char *minetest_version_hash;
-- 
cgit v1.2.3