Index: amd64/amd64/machdep.c
===================================================================
--- amd64/amd64/machdep.c	(revision 234389)
+++ amd64/amd64/machdep.c	(working copy)
@@ -74,6 +74,7 @@
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
@@ -206,6 +207,8 @@
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 struct mtx dt_lock;	/* lock for GDT and LDT */
 
 static void
Index: amd64/amd64/mem.c
===================================================================
--- amd64/amd64/mem.c	(revision 234389)
+++ amd64/amd64/mem.c	(working copy)
@@ -72,8 +72,6 @@
  */
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
 
-struct mem_range_softc mem_range_softc;
-
 /* ARGSUSED */
 int
 memrw(struct cdev *dev, struct uio *uio, int flags)
Index: i386/i386/machdep.c
===================================================================
--- i386/i386/machdep.c	(revision 234389)
+++ i386/i386/machdep.c	(working copy)
@@ -75,6 +75,7 @@
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
@@ -248,6 +249,8 @@
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 static void
 cpu_startup(dummy)
 	void *dummy;
Index: i386/i386/mem.c
===================================================================
--- i386/i386/mem.c	(revision 234389)
+++ i386/i386/mem.c	(working copy)
@@ -72,8 +72,6 @@
  */
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
 
-struct mem_range_softc mem_range_softc;
-
 static struct sx memsxlock;
 SX_SYSINIT(memsxlockinit, &memsxlock, "/dev/mem lock");
 
Index: pc98/pc98/machdep.c
===================================================================
--- pc98/pc98/machdep.c	(revision 234389)
+++ pc98/pc98/machdep.c	(working copy)
@@ -73,6 +73,7 @@
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/memrange.h>
 #include <sys/msgbuf.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
@@ -217,6 +218,8 @@
 
 struct mtx icu_lock;
 
+struct mem_range_softc mem_range_softc;
+
 static void
 cpu_startup(dummy)
 	void *dummy;