diff --git a/sys/arch/hp300/include/aout_machdep.h b/sys/arch/hp300/include/aout_machdep.h
index 31929855693b..33381fe96eb2 100644
--- a/sys/arch/hp300/include/aout_machdep.h
+++ b/sys/arch/hp300/include/aout_machdep.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: aout_machdep.h,v 1.6 1994/01/28 23:43:55 jtc Exp $
+ *	$Id: aout_machdep.h,v 1.7 1994/05/04 04:10:28 mycroft Exp $
  */
 
 #ifndef _HP300_EXEC_H_
@@ -32,7 +32,7 @@
 
 #ifdef KERNEL
 
-#ifdef HPUXCOMPAT
+#ifdef COMPAT_HPUX
 #include "user.h"			/* for pcb */
 #include "hp300/hpux/hpux_exec.h"
 #endif
@@ -50,7 +50,7 @@ int cpu_exec_makecmds __P((struct proc *p, struct exec_package *epp));
  * type (a_mid) field is valid for this architecture
  * a non-zero return value indicates that the machine type is correct.
  */
-#ifdef HPUXCOMPAT
+#ifdef COMPAT_HPUX
 #define cpu_exec_checkmid(mid) ((mid == MID_HP200) || (mid == MID_HP300) || \
 				(mid == MID_HPUX))
 #else
diff --git a/sys/arch/hp300/include/exec.h b/sys/arch/hp300/include/exec.h
index 6ddc5798b1f6..b8bb37401cab 100644
--- a/sys/arch/hp300/include/exec.h
+++ b/sys/arch/hp300/include/exec.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: exec.h,v 1.6 1994/01/28 23:43:55 jtc Exp $
+ *	$Id: exec.h,v 1.7 1994/05/04 04:10:28 mycroft Exp $
  */
 
 #ifndef _HP300_EXEC_H_
@@ -32,7 +32,7 @@
 
 #ifdef KERNEL
 
-#ifdef HPUXCOMPAT
+#ifdef COMPAT_HPUX
 #include "user.h"			/* for pcb */
 #include "hp300/hpux/hpux_exec.h"
 #endif
@@ -50,7 +50,7 @@ int cpu_exec_makecmds __P((struct proc *p, struct exec_package *epp));
  * type (a_mid) field is valid for this architecture
  * a non-zero return value indicates that the machine type is correct.
  */
-#ifdef HPUXCOMPAT
+#ifdef COMPAT_HPUX
 #define cpu_exec_checkmid(mid) ((mid == MID_HP200) || (mid == MID_HP300) || \
 				(mid == MID_HPUX))
 #else
diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h
index f41403aeb637..ef95864e4f8a 100644
--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@@ -37,7 +37,7 @@
  *
  *	from: Utah Hdr: machparam.h 1.11 89/08/14
  *	from: @(#)param.h	7.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.8 1994/02/22 07:29:02 hpeyerl Exp $
+ *	$Id: param.h,v 1.9 1994/05/04 04:10:29 mycroft Exp $
  */
 
 /*
@@ -197,7 +197,7 @@ int	cpuspeed;
 #define	DELAY(n)	{ register int N = (n); while (--N > 0); }
 #endif
 
-#ifdef HPUXCOMPAT
+#ifdef COMPAT_HPUX
 /*
  * Constants/macros for HPUX multiple mapping of user address space.
  * Pages in the first 256Mb are mapped in at every 256Mb segment.