diff --git a/src/conio/cterm.c b/src/conio/cterm.c
index 4f118c1e5b66b20569db0aef98a6ba9eaa06d830..555ca347b30b7ba38b94f62d1326edc691bf9ba2 100644
--- a/src/conio/cterm.c
+++ b/src/conio/cterm.c
@@ -36,6 +36,7 @@
 
 #include <genwrap.h>
 #include <ciolib.h>
+#include <xpbeep.h>
 #include <keys.h>
 
 #include "cterm.h"
@@ -169,7 +170,7 @@ void playnote(int notenum, int notelen, int dotted)
 			break;
 	}
 	duration-=pauselen;
-	BEEP((note_frequency[notenum]+500)/1000,duration);
+	BEEP(((double)note_frequency[notenum])/1000,duration);
 	SLEEP(pauselen);
 }
 
diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h
index a1d8f3bd734e692439d3c50609539ac6d97ad903..d816fe68fc3ed5c4c46e483c3a5e5ddf376ee4a3 100644
--- a/src/sbbs3/sbbsdefs.h
+++ b/src/sbbs3/sbbsdefs.h
@@ -43,6 +43,7 @@
 #include "gen_defs.h"	/* uchar, ushort, uint, ulong, etc. */
 #include "nodedefs.h"	/* node_t */
 #include "fidodefs.h"	/* fmsghdr_t, fpkthdr_t, FIDO_*, etc. */
+#include "xpbeep.h"		/* BEEP() */
 
 /*************/
 /* Constants */
diff --git a/src/sbbs3/sexyz.c b/src/sbbs3/sexyz.c
index 58cd098d324461ad51c00d46d3b6ffcdb28bfb4a..9aef36703a0baf7b1f8a56053ce620a6e695b922 100644
--- a/src/sbbs3/sexyz.c
+++ b/src/sbbs3/sexyz.c
@@ -62,6 +62,7 @@
 #include "ini_file.h"
 #include "eventwrap.h"
 #include "threadwrap.h"
+#include "xpbeep.h"
 
 /* sbbs */
 #include "ringbuf.h"
diff --git a/src/stp/stp.c b/src/stp/stp.c
index be3e7039b54f075cefbcc4d0fb37dfbe081a101f..80e2de8f09957be5ff4770ad8738bbd5a1dceea3 100644
--- a/src/stp/stp.c
+++ b/src/stp/stp.c
@@ -48,6 +48,7 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 
+#include "xpbeep.h"
 #include "conwrap.h"
 #include "genwrap.h"
 #include "dirwrap.h"
diff --git a/src/tone/tone.c b/src/tone/tone.c
index 8f50631410d52ddb7c3a9871b697a01372109725..59c09cdd8a5821756ee034bcd2805c082787c14b 100644
--- a/src/tone/tone.c
+++ b/src/tone/tone.c
@@ -41,7 +41,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "genwrap.h"	/* BEEP */
+#include "xpbeep.h"	/* BEEP */
+#include "genwrap.h"
 #include "dirwrap.h"	/* getfname */
 #include "conwrap.h"	/* kbhit */