diff --git a/source/client/client.c b/source/client/client.c
index 6449781b3f0..6c777bca509 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "clilist.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source/include/includes.h b/source/include/includes.h
index cc03607e914..cae45435c5c 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -152,7 +152,6 @@ extern int errno;
 #endif
 
 /* Lists, trees, caching, database... */
-#include "version.h"
 #include "xfile.h"
 #define TALLOC_DEPRECATED 1
 #include "lib/talloc/talloc.h"
diff --git a/source/lib/cmdline/popt_common.c b/source/lib/cmdline/popt_common.c
index c7bd35cbabe..e440611ee47 100644
--- a/source/lib/cmdline/popt_common.c
+++ b/source/lib/cmdline/popt_common.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
diff --git a/source/lib/fault.c b/source/lib/fault.c
index ac2d4109fd4..d90281f950c 100644
--- a/source/lib/fault.c
+++ b/source/lib/fault.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "system/wait.h"
 
 static void (*cont_fn)(void *);
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index cd551af7f0c..e4b371e2d5b 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 
 #ifdef HAVE_LDAP
 
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 33559aa5285..616cf50afb0 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "system/time.h"
 #include "system/iconv.h"
diff --git a/source/smbd/process_thread.c b/source/smbd/process_thread.c
index f0e98221aec..8d65292cfda 100644
--- a/source/smbd/process_thread.c
+++ b/source/smbd/process_thread.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include <pthread.h>
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>