diff --git a/src/version.c b/src/version.c
index 9cd54a3..130bbde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1311,
+/**/
     1310,
 /**/
     1309,
diff --git a/src/vim.h b/src/vim.h
index 17034ef..7f72604 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1730,6 +1730,14 @@
 typedef int proftime_T;	    /* dummy for function prototypes */
 #endif
 
+#ifdef FEAT_CHANNEL
+# ifdef WIN64
+typedef __int64 sock_T;
+# else
+typedef int sock_T;
+# endif
+#endif
+
 /* Include option.h before structs.h, because the number of window-local and
  * buffer-local options is used there. */
 #include "option.h"	    /* options and default values */
@@ -1970,14 +1978,6 @@
 # define stat(a,b) (access(a,0) ? -1 : stat(a,b))
 #endif
 
-#ifdef FEAT_CHANNEL
-# ifdef WIN64
-typedef __int64 sock_T;
-# else
-typedef int sock_T;
-# endif
-#endif
-
 #include "ex_cmds.h"	    /* Ex command defines */
 #include "proto.h"	    /* function prototypes */