diff --git a/sys/arch/mips/pmon/pmon.c b/sys/arch/mips/pmon/pmon.c
index e03adb4a4d90..0936ac574d74 100644
--- a/sys/arch/mips/pmon/pmon.c
+++ b/sys/arch/mips/pmon/pmon.c
@@ -18,9 +18,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/cpu.h>
 #include <sys/proc.h>
 
-#include <machine/cpu.h>
+#include <mips/cpuregs.h>
 #include <mips/pmon/pmon.h>
 
 int	pmon_argc;
diff --git a/sys/arch/mips/pmon/pmon32.S b/sys/arch/mips/pmon/pmon32.S
index e1f904b1ac13..71a66575e68e 100644
--- a/sys/arch/mips/pmon/pmon32.S
+++ b/sys/arch/mips/pmon/pmon32.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmon32.S,v 1.1 2011/08/27 13:34:29 bouyer Exp $ */
+/*	$NetBSD: pmon32.S,v 1.2 2015/06/26 22:32:23 matt Exp $ */
 /*	OpenBSD: pmon32.S,v 1.4 2010/02/18 18:53:33 miod Exp 	*/
 
 /*
@@ -28,10 +28,11 @@
  * than four arguments; other functions are not affected.
  */
 
-#include <machine/param.h>
 #include <machine/asm.h>
 
-#ifndef _STANDALONE
+#ifdef _STANDALONE
+#include <machine/param.h>
+#else
 #include "assym.h"
 #endif