diff --git a/src/version.c b/src/version.c
index 130bbde..b934ea2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1312,
+/**/
     1311,
 /**/
     1310,
diff --git a/src/vim.h b/src/vim.h
index 7f72604..0297cfd 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1730,12 +1730,10 @@
 typedef int proftime_T;	    /* dummy for function prototypes */
 #endif
 
-#ifdef FEAT_CHANNEL
-# ifdef WIN64
+#ifdef WIN64
 typedef __int64 sock_T;
-# else
+#else
 typedef int sock_T;
-# endif
 #endif
 
 /* Include option.h before structs.h, because the number of window-local and