--- src/sys/sys/disk.h	2006/07/28 02:17:41	1.8
+++ src/sys/sys/disk.h	2006/07/30 16:49:34	1.9
@@ -53,14 +53,10 @@
 #include <sys/diskslice.h>
 #endif
 
-#ifndef _SYS_DISKLABEL
+#ifndef _SYS_DISKLABEL_H_
 #include <sys/disklabel.h>
 #endif
 
-#ifndef _SYS_DISKLABEL
-#include <sys/msgport.h>
-#endif
-
 struct disk {
 	struct dev_ops		*d_dev_ops;	/* our device switch */
 	struct dev_ops		*d_raw_ops;	/* the raw device switch */