@@ -106,16 +106,16 @@ endforeach()
 endfunction()
 
 # Version information
-add_custom_target(version-info ALL ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_SOURCE_DIR}/src/util/version.c.in
+add_custom_target(version-info ALL ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_SOURCE_DIR}/src/core/version.c.in
 	COMMAND ${CMAKE_COMMAND}
 	-DBINARY_NAME=${BINARY_NAME}
-	-DCONFIG_FILE=${CMAKE_CURRENT_SOURCE_DIR}/src/util/version.c.in
+	-DCONFIG_FILE=${CMAKE_CURRENT_SOURCE_DIR}/src/core/version.c.in
 	-DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/version.c
 	-P ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/version.cmake)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/util/version.c.in ${CMAKE_CURRENT_BINARY_DIR}/version.c)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/core/version.c.in ${CMAKE_CURRENT_BINARY_DIR}/version.c)
 list(APPEND UTIL_SRC ${CMAKE_CURRENT_BINARY_DIR}/version.c)
 source_group("Generated sources" FILES ${CMAKE_CURRENT_BINARY_DIR}/version.c)
 

@@ -5,6 +5,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "config.h"
 
+#include "core/version.h"
 #include "util/formatting.h"
 #include "util/string.h"
 #include "util/vfs.h"

@@ -8,6 +8,7 @@
 #ifdef USE_CLI_DEBUGGER
 
 #include "core/core.h"
+#include "core/version.h"
 #include "parser.h"
 
 #include <signal.h>

@@ -6,6 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "commandline.h"
 
 #include "core/config.h"
+#include "core/version.h"
 #include "util/string.h"
 
 #include <fcntl.h>

@@ -3,7 +3,8 @@ *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- #include "core/core.h"
+#include "core/core.h"
+#include "core/version.h"
 #include "util/socket.h"
 
 #include <SDL.h>

@@ -8,6 +8,7 @@
 #include "util/common.h"
 
 #include "core/core.h"
+#include "core/version.h"
 #ifdef M_CORE_GB
 #include "gb/core.h"
 #include "gb/gb.h"

@@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "AboutScreen.h"
 
 extern "C" {
-#include "util/version.h"
+#include "core/version.h"
 }
 
 #include <QPixmap>

@@ -16,6 +16,7 @@ #include <QFileOpenEvent>
 #include <QIcon>
 
 extern "C" {
+#include "core/version.h"
 #include "feature/commandline.h"
 #include "util/nointro.h"
 #include "util/socket.h"

@@ -18,6 +18,7 @@ #include <QGridLayout>
 #include <QSpinBox>
 
 extern "C" {
+#include "core/version.h"
 #include "platform/video-backend.h"
 
 #if !defined(_WIN32) || defined(USE_EPOXY)

@@ -38,6 +38,7 @@ #include "ShortcutController.h"
 #include "VideoView.h"
 
 extern "C" {
+#include "core/version.h"
 #ifdef M_CORE_GB
 #include "gb/gb.h"
 #endif

@@ -5,6 +5,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
+#include "core/version.h"
+
 void mSDLGLCommonSwap(struct VideoBackend* context) {
 	struct mSDLRenderer* renderer = (struct mSDLRenderer*) context->user;
 #if SDL_VERSION_ATLEAST(2, 0, 0)

@@ -21,8 +21,6 @@ #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "version.h"
-
 #ifdef _WIN32
 // WinSock2 gets very angry if it's included too late
 #include <winsock2.h>

@@ -1,9 +1,9 @@
-/* Copyright (c) 2013-2015 Jeffrey Pfau
+/* Copyright (c) 2013-2016 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "util/version.h"
+#include "core/version.h"
 
 const char* const gitCommit = "${GIT_COMMIT}";
 const char* const gitCommitShort = "${GIT_COMMIT_SHORT}";

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015 Jeffrey Pfau
+/* Copyright (c) 2013-2016 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this