diff --git a/app/Makefile.am b/app/Makefile.am
index a6738ce667..803b53c3b5 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -60,14 +60,14 @@ libapp_sources = \
 	tests.h			\
 	unique.c		\
 	unique.h		\
-	version.c		\
-	version.h		\
 	gimp-debug.c		\
 	gimp-debug.h		\
+	gimp-intl.h		\
 	gimp-log.c		\
 	gimp-log.h		\
 	gimp-priorities.h	\
-	gimp-intl.h
+	gimp-version.c		\
+	gimp-version.h
 
 libapp_generated_sources = \
 	git-version.h
diff --git a/app/version.c b/app/gimp-version.c
similarity index 99%
rename from app/version.c
rename to app/gimp-version.c
index 15bc0dbeca..42e6355e71 100644
--- a/app/version.c
+++ b/app/gimp-version.c
@@ -32,10 +32,10 @@
 #include "libgimpbase/gimpbase.h"
 
 #include "about.h"
-#include "version.h"
 #include "git-version.h"
 
 #include "gimp-intl.h"
+#include "gimp-version.h"
 
 
 static gchar *
diff --git a/app/version.h b/app/gimp-version.h
similarity index 99%
rename from app/version.h
rename to app/gimp-version.h
index 9f5f61ac3e..0b52fdbe06 100644
--- a/app/version.h
+++ b/app/gimp-version.h
@@ -19,7 +19,6 @@
 #define __VERSION_H__
 
 
-
 void    gimp_version_show (gboolean be_verbose);
 gchar * gimp_version      (gboolean be_verbose,
                            gboolean localized);
diff --git a/app/main.c b/app/main.c
index a25ef51d2f..7c0bdac73d 100644
--- a/app/main.c
+++ b/app/main.c
@@ -63,7 +63,6 @@
 #include "sanity.h"
 #include "signals.h"
 #include "unique.h"
-#include "version.h"
 
 #ifdef G_OS_WIN32
 /* To get PROCESS_DEP_* defined we need _WIN32_WINNT at 0x0601. We still
@@ -79,6 +78,7 @@
 
 #include "gimp-log.h"
 #include "gimp-intl.h"
+#include "gimp-version.h"
 
 
 static gboolean  gimp_option_fatal_warnings   (const gchar  *option_name,
diff --git a/app/widgets/gimpcriticaldialog.c b/app/widgets/gimpcriticaldialog.c
index 77e33c06fe..ee20107a68 100644
--- a/app/widgets/gimpcriticaldialog.c
+++ b/app/widgets/gimpcriticaldialog.c
@@ -42,9 +42,8 @@
 
 #include "gimpcriticaldialog.h"
 
-#include "version.h"
-
 #include "gimp-intl.h"
+#include "gimp-version.h"
 
 typedef struct _GimpCriticalDialog       GimpCriticalDialog;
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9f14a052bd..7abe5de215 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,8 +33,8 @@ EXTRA_PROGRAMS = \
 gimpdebug_2_0_SOURCES = gimpdebug.c                         \
 			../app/widgets/gimpcriticaldialog.h \
 			../app/widgets/gimpcriticaldialog.c \
-			../app/version.h                    \
-			../app/version.c
+			../app/gimp-version.h               \
+			../app/gimp-version.c
 
 gimpdebug_2_0_CPPFLAGS = \
 	-DCC_VERSION=\""$(CC_VERSION)"\" \