diff --git a/sys/arch/hppa/include/lock.h b/sys/arch/hppa/include/lock.h
index 870dbafbb2c0..4e21106a71e8 100644
--- a/sys/arch/hppa/include/lock.h
+++ b/sys/arch/hppa/include/lock.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: lock.h,v 1.2 2003/06/23 11:01:16 martin Exp $	*/
+/* 	$NetBSD: lock.h,v 1.3 2003/09/20 22:28:19 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,9 @@
 #ifndef _HPPA_LOCK_H_
 #define	_HPPA_LOCK_H_
 
+#ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
+#endif
 
 #ifdef	MULTIPROCESSOR
 
diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h
index 381a4ef26725..b37fb41e11d2 100644
--- a/sys/arch/hppa/include/param.h
+++ b/sys/arch/hppa/include/param.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.4 2003/06/23 11:01:17 martin Exp $	*/
+/*	$NetBSD: param.h,v 1.5 2003/09/20 22:28:19 matt Exp $	*/
 
 /*	$OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $	*/
 
@@ -25,7 +25,9 @@
  * 	Utah $Hdr: param.h 1.18 94/12/16$
  */
 
+#ifdef _KERNEL_OPT
 #include "opt_compat_hpux.h"
+#endif
 #include <sys/featuretest.h>
 
 #if defined(_NETBSD_SOURCE)