diff --git a/src/ops.c b/src/ops.c
index 4eef688..5e0c99f 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -4155,7 +4155,8 @@
     char_u	*cend;
     char_u	*newp;
     char_u	*spaces;	/* number of spaces inserte before a line */
-    int		endcurr1, endcurr2;
+    int		endcurr1 = NUL;
+    int		endcurr2 = NUL;
     int		currsize = 0;	/* size of the current line */
     int		sumsize = 0;	/* size of the long new line */
     linenr_T	t;
diff --git a/src/os_macosx.m b/src/os_macosx.m
index 7067df4..dcde551 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -686,7 +686,7 @@
 	    n = [mstring replaceOccurrencesOfString:@"\x0d" withString:@"\x0a"
 					   options:0 range:range];
 	}
-	
+
 	/* Scan for newline character to decide whether the string should be
 	 * pasted line-wise or character-wise.
 	 */
@@ -734,7 +734,7 @@
     cbd->owned = TRUE;
     clip_get_selection(cbd);
     cbd->owned = FALSE;
-    
+
     /* Get the text to put on the pasteboard. */
     long_u llen = 0; char_u *str = 0;
     int motion_type = clip_convert_selection(&str, &llen, cbd);
@@ -771,7 +771,7 @@
 	[pb setPropertyList:plist forType:VimPboardType];
 
 	[pb setString:string forType:NSStringPboardType];
-	
+
 	[string release];
     }
 
diff --git a/src/proto.h b/src/proto.h
index 01db689..c39f7f0 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -277,6 +277,13 @@
 #ifdef MACOS_CONVERT
 # include "os_mac_conv.pro"
 #endif
+#if defined(MACOS_X_UNIX) && defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI)
+/* functions in os_macosx.m */
+void clip_mch_lose_selection(VimClipboard *cbd);
+int clip_mch_own_selection(VimClipboard *cbd);
+void clip_mch_request_selection(VimClipboard *cbd);
+void clip_mch_set_selection(VimClipboard *cbd);
+#endif
 
 #ifdef __BORLANDC__
 # define _PROTO_H