diff --git a/src/structs.h b/src/structs.h
index 329676e..f4f1a87 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -33,9 +33,9 @@
 } pos_T;
 
 #ifdef FEAT_VIRTUALEDIT
-# define INIT_POS_T {0, 0, 0}
+# define INIT_POS_T(l, c, ca) {l, c, ca}
 #else
-# define INIT_POS_T {0, 0}
+# define INIT_POS_T(l, c, ca) {l, c}
 #endif
 
 /*
@@ -1166,7 +1166,7 @@
     char_u	*b_fname;	/* current file name */
 
 #ifdef UNIX
-    int		b_dev;		/* device number (-1 if not set) */
+    dev_t	b_dev;		/* device number (-1 if not set) */
     ino_t	b_ino;		/* inode number */
 #endif
 #ifdef FEAT_CW_EDITOR
@@ -1645,7 +1645,11 @@
 #endif
 #ifdef FEAT_DIFF
     diff_T	    *tp_first_diff;
+# ifdef S_SPLINT_S  /* splint doesn't understand the array of pointers */
+    buf_T	    **tp_diffbuf;
+# else
     buf_T	    *(tp_diffbuf[DB_COUNT]);
+# endif
     int		    tp_diff_invalid;	/* list of diffs is outdated */
 #endif
     frame_T	    *tp_snapshot;    /* window layout snapshot */