diff -rubB cygipc/include/sys/ipc.h cygipc_new/include/sys/ipc.h
--- cygipc/include/sys/ipc.h	Fri Feb 16 23:08:37 2001
+++ cygipc_new/include/sys/ipc.h	Sat Sep  1 08:59:28 2001
@@ -37,6 +37,10 @@
 
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #define IPC_PRIVATE ((key_t) 0)  
 
 struct ipc_perm
@@ -92,7 +96,14 @@
 #define SHMCTL 		24
 
 #define IPCCALL(version,op)	((version)<<16 | (op))
+
+
 extern key_t ftok (const char *pathname, int proj_id);
+
+#ifdef __cplusplus
+}
+#endif 
+
 
 #endif /* _CYGWIN_IPC_H */
 
Only in cygipc_new/include/sys: ipc.h~
diff -rubB cygipc/include/sys/ipctrace.h cygipc_new/include/sys/ipctrace.h
--- cygipc/include/sys/ipctrace.h	Sat Feb 10 23:50:02 2001
+++ cygipc_new/include/sys/ipctrace.h	Sat Sep  1 09:02:20 2001
@@ -34,6 +34,10 @@
 #ifndef _IPCTRACE_H
 #define _IPCTRACE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 extern int cygipc_get_debug(void);
 extern void cygipc_set_debug(int new_val);
 extern int cygipc_tracing_enabled(void);
@@ -48,6 +52,10 @@
 #else
 #define debug_printf(fmt, args...)
 #endif
+
+#ifdef __cplusplus
+}
+#endif 
 
 #endif /*_IPCTRACE_H */    
 	
Only in cygipc_new/include/sys: ipctrace.h.bak
diff -rubB cygipc/include/sys/msg.h cygipc_new/include/sys/msg.h
--- cygipc/include/sys/msg.h	Sun Jan  7 06:16:53 2001
+++ cygipc_new/include/sys/msg.h	Sat Sep  1 09:02:24 2001
@@ -38,6 +38,10 @@
 #ifndef _CYGWIN_MSG_H
 #define _CYGWIN_MSG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 /* msgrcv options */
 #define MSG_NOERROR     010000  /* no error if message is too big */
 #define MSG_EXCEPT      020000  /* recv any msg except of specified type.*/
@@ -112,5 +116,10 @@
 int msgrcv (int msqid, struct msgbuf *msgp, size_t msgsz, long msgtyp,
 		       int msgflg);
 int msgctl (int msqid, int cmd, struct msqid_ds *buf);
+
+#ifdef __cplusplus
+}
+#endif 
+
 
 #endif /* _CYGWIN_MSG_H */
Only in cygipc_new/include/sys: msg.h.bak
diff -rubB cygipc/include/sys/sem.h cygipc_new/include/sys/sem.h
--- cygipc/include/sys/sem.h	Sun Sep 17 01:01:33 2000
+++ cygipc_new/include/sys/sem.h	Sat Sep  1 09:00:49 2001
@@ -35,6 +35,10 @@
 #ifndef _CYGWIN_SEM_H
 #define _CYGWIN_SEM_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 /* semop flags */
 #define SEM_UNDO        0x1000  /* undo the operation on exit */
 
@@ -112,5 +116,9 @@
 extern int semget (key_t key, int nsems, int semflg);
 extern int semop (int semid, struct sembuf *sops, unsigned nsops);
 extern int semctl (int semid, int semnum, int cmd, union semun arg);
+
+#ifdef __cplusplus
+}
+#endif 
 
 #endif /* _CYGWIN_SEM_H */
diff -rubB cygipc/include/sys/shm.h cygipc_new/include/sys/shm.h
--- cygipc/include/sys/shm.h	Sun Sep 17 01:01:33 2000
+++ cygipc_new/include/sys/shm.h	Sat Sep  1 08:59:07 2001
@@ -38,6 +38,10 @@
 #ifndef _CYGWIN_SHM_H_
 #define _CYGWIN_SHM_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #define SHMMNI		128
 
 struct vm_area_struct {
@@ -115,6 +119,10 @@
 
 int shmdt (char *shmaddr);
 int shmctl (int shmid, int cmd, struct shmid_ds *buf);
+
+#ifdef __cplusplus
+}
+#endif 
 
 #endif /* _CYGWIN_SHM_H_ */