diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 0e42f6ed0c6..504ac5bff79 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -44,7 +44,7 @@
 #include <dev/hptmv/global.h>
 #include <dev/hptmv/hptintf.h>
 #include <dev/hptmv/osbsd.h>
-#include <contrib/dev/hptmv/access601.h>
+#include <dev/hptmv/access601.h>
 
 #ifdef DEBUG
 #ifdef DEBUG_LEVEL
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index 3f8d4dd7ae3..90c62aea90d 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -29,8 +29,8 @@
 #define _GLOBAL_H_
 
 #include <dev/hptmv/mvOs.h>
-#include <contrib/dev/hptmv/mvSata.h>
-#include <contrib/dev/hptmv/mvStorageDev.h>
+#include <dev/hptmv/mvSata.h>
+#include <dev/hptmv/mvStorageDev.h>
 
 #define COMPANY			"HighPoint Technologies, Inc."
 #define COPYRIGHT		"(c) 2000-2004. HighPoint Technologies, Inc."
@@ -203,11 +203,11 @@ extern void HPTLIBAPI ioctl_ReportEvent(UCHAR event, PVOID param);
 	UCHAR ptr##__buf[512];		\
 	type ptr=(type)ptr##__buf
 
-#include <contrib/dev/hptmv/atapi.h>
-#include <contrib/dev/hptmv/command.h>
-#include <contrib/dev/hptmv/array.h>
-#include <contrib/dev/hptmv/raid5n.h>
-#include <contrib/dev/hptmv/vdevice.h>
+#include <dev/hptmv/atapi.h>
+#include <dev/hptmv/command.h>
+#include <dev/hptmv/array.h>
+#include <dev/hptmv/raid5n.h>
+#include <dev/hptmv/vdevice.h>
 
 int HPTLIBAPI fDeReadWrite(PDevice pDev, ULONG Lba, UCHAR Cmd, void *tmpBuffer);
 void HPTLIBAPI fDeSelectMode(PDevice pDev, UCHAR NewMode);
diff --git a/sys/dev/hptmv/gui_lib.c b/sys/dev/hptmv/gui_lib.c
index 9ef289e99ac..41ab69a518f 100644
--- a/sys/dev/hptmv/gui_lib.c
+++ b/sys/dev/hptmv/gui_lib.c
@@ -45,7 +45,7 @@
 #include <dev/hptmv/global.h>
 #include <dev/hptmv/hptintf.h>
 #include <dev/hptmv/osbsd.h>
-#include <contrib/dev/hptmv/access601.h>
+#include <dev/hptmv/access601.h>
 
 static int hpt_get_driver_capabilities(PDRIVER_CAPABILITIES cap);
 static int hpt_get_controller_count(void);
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index dc43129ec82..1c4fb90b008 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -38,7 +38,7 @@
 #include <dev/hptmv/global.h>
 #include <dev/hptmv/hptintf.h>
 #include <dev/hptmv/osbsd.h>
-#include <contrib/dev/hptmv/access601.h>
+#include <dev/hptmv/access601.h>
 
 int hpt_rescan_all(void);
 
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index 0f9f71d49b4..c75c98fd194 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -36,7 +36,7 @@
 #include <dev/hptmv/global.h>
 #include <dev/hptmv/hptintf.h>
 #include <dev/hptmv/osbsd.h>
-#include <contrib/dev/hptmv/access601.h>
+#include <dev/hptmv/access601.h>
 
 #pragma pack(1)
 
diff --git a/sys/dev/hptmv/mvStorageDev.h b/sys/dev/hptmv/mvStorageDev.h
index 8b989587492..5d533fedb86 100644
--- a/sys/dev/hptmv/mvStorageDev.h
+++ b/sys/dev/hptmv/mvStorageDev.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD$
- *
+ */
 #ifndef __INCmvStorageDevh
 #define __INCmvStorageDevh