diff -Naur linux-2.3.99-pre6-5/include/linux/cdrom.h linux-2.3.99-pre6-5-new/include/linux/cdrom.h
--- linux-2.3.99-pre6-5/include/linux/cdrom.h	Thu Mar 23 17:36:08 2000
+++ linux-2.3.99-pre6-5-new/include/linux/cdrom.h	Sat Apr 22 02:41:49 2000
@@ -905,7 +905,7 @@
 #endif
 	__u8     curlba[3];
 	__u8     nslots;
-	__u8 short slot_tablelen;
+	unsigned short slot_tablelen;
 };
 
 struct cdrom_slot {
diff -Naur linux-2.3.99-pre6-5/include/linux/raid/md.h linux-2.3.99-pre6-5-new/include/linux/raid/md.h
--- linux-2.3.99-pre6-5/include/linux/raid/md.h	Thu Mar 23 17:39:32 2000
+++ linux-2.3.99-pre6-5-new/include/linux/raid/md.h	Sat Apr 22 02:41:50 2000
@@ -90,5 +90,4 @@
 
 #define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); }
 
-#endif _MD_H
-
+#endif /* _MD_H */
diff -Naur linux-2.3.99-pre6-5/include/linux/raid/md_compatible.h linux-2.3.99-pre6-5-new/include/linux/raid/md_compatible.h
--- linux-2.3.99-pre6-5/include/linux/raid/md_compatible.h	Thu Mar 23 17:36:18 2000
+++ linux-2.3.99-pre6-5-new/include/linux/raid/md_compatible.h	Sat Apr 22 02:41:50 2000
@@ -156,5 +156,5 @@
 
 /* END */
 
-#endif _MD_COMPATIBLE_H
+#endif /* _MD_COMPATIBLE_H */
 
diff -Naur linux-2.3.99-pre6-5/include/linux/raid/md_k.h linux-2.3.99-pre6-5-new/include/linux/raid/md_k.h
--- linux-2.3.99-pre6-5/include/linux/raid/md_k.h	Wed Feb 23 11:13:52 2000
+++ linux-2.3.99-pre6-5-new/include/linux/raid/md_k.h	Sat Apr 22 02:41:50 2000
@@ -339,5 +339,4 @@
 	char name [MAX_DISKNAME_LEN];
 } dev_name_t;
 
-#endif _MD_K_H
-
+#endif /* _MD_K_H */
diff -Naur linux-2.3.99-pre6-5/include/linux/raid/md_p.h linux-2.3.99-pre6-5-new/include/linux/raid/md_p.h
--- linux-2.3.99-pre6-5/include/linux/raid/md_p.h	Tue Feb  8 13:39:00 2000
+++ linux-2.3.99-pre6-5-new/include/linux/raid/md_p.h	Sat Apr 22 02:41:50 2000
@@ -157,5 +157,4 @@
 
 } mdp_super_t;
 
-#endif _MD_P_H
-
+#endif /* _MD_P_H */
diff -Naur linux-2.3.99-pre6-5/include/linux/raid/md_u.h linux-2.3.99-pre6-5-new/include/linux/raid/md_u.h
--- linux-2.3.99-pre6-5/include/linux/raid/md_u.h	Fri Apr 21 21:55:48 2000
+++ linux-2.3.99-pre6-5-new/include/linux/raid/md_u.h	Sat Apr 22 02:41:50 2000
@@ -111,5 +111,4 @@
 	int			max_fault;	/* unused for now */
 } mdu_param_t;
 
-#endif _MD_U_H
-
+#endif /* _MD_U_H */
diff -Naur linux-2.3.99-pre6-5/include/linux/skbuff.h linux-2.3.99-pre6-5-new/include/linux/skbuff.h
--- linux-2.3.99-pre6-5/include/linux/skbuff.h	Fri Apr 21 21:55:48 2000
+++ linux-2.3.99-pre6-5-new/include/linux/skbuff.h	Sat Apr 22 02:41:50 2000
@@ -766,7 +766,7 @@
 	return skb->data;
 }
 
-extern __inline__ char *__skb_pull(struct sk_buff *skb, unsigned int len)
+extern __inline__ unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
 {
 	skb->len-=len;
 	return 	skb->data+=len;