diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index a87c43565021..1fd27452dd03 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -70,15 +70,4 @@ struct vm_page;
 typedef struct vm_page *vm_page_t;
 #endif
 
-/*
- *	MACH VM locking type mappings to kernel types
- */
-#include <sys/lock.h>
-typedef struct simplelock	simple_lock_data_t;
-typedef struct simplelock	*simple_lock_t;
-#if 0
-typedef struct lock		lock_data_t;
-typedef struct lock		*lock_t;
-#endif
-
 #endif				/* VM_H */
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 1c55c57ae268..19dfaa7a2957 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -133,7 +133,7 @@ struct vm_map {
 	vm_size_t size;			/* virtual size */
 	boolean_t is_main_map;		/* Am I a main map? */
 	int ref_count;			/* Reference count */
-	simple_lock_data_t ref_lock;	/* Lock for ref_count field */
+	struct simplelock ref_lock;	/* Lock for ref_count field */
 	vm_map_entry_t hint;		/* hint for quick lookups */
 	vm_map_entry_t first_free;	/* First free space hint */
 	boolean_t entries_pageable;	/* map entries pageable?? */
@@ -188,8 +188,6 @@ typedef struct {
  *		Perform locking on the data portion of a map.
  */
 
-#include <sys/proc.h>	/* XXX for curproc and p_pid */
-
 #define	vm_map_lock_drain_interlock(map) { \
 	lockmgr(&(map)->lock, LK_DRAIN|LK_INTERLOCK, \
 		&(map)->ref_lock, curproc); \