diff --git a/src/version.c b/src/version.c
index 65e2f58f80..a02a9e2d84 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1925,
 /**/
     1924,
 /**/
diff --git a/src/vim.h b/src/vim.h
index e41a68f1c2..2b37da2aff 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -315,12 +315,12 @@
 // cause compilation failures even though the headers are correct.  For
 // a concrete example, gcc-3.2 enforces exception specifications, and
 // glibc-2.2.5 has them in their system headers.
-#ifndef PROTO
-# if !defined(__cplusplus) && defined(UNIX) \
-	&& !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
-#  include "auto/osdef.h"	// bring missing declarations in
-# endif
+#if !defined(__cplusplus) && defined(UNIX) \
+       && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
+# include "auto/osdef.h"	// bring missing declarations in
+#endif
 
+#ifndef PROTO
 # ifdef AMIGA
 #  include "os_amiga.h"
 # endif