--- np2/sound/beepc.c	2003/10/20 12:08:01	1.5
+++ np2/sound/beepc.c	2003/12/08 00:55:33	1.6
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"sound.h"
@@ -81,7 +81,7 @@ static void beep_eventset(void) {
 	if (beep.enable != enable) {
 		beep.enable = enable;
 		if (beep.events < BEEPEVENT_MAX) {
-			clock = I286_CLOCK + I286_BASECLOCK - I286_REMCLOCK;
+			clock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
 			evt = beep.event + beep.events;
 			beep.events++;
 			evt->clock = (clock - beep.clock) * beepcfg.samplebase;