diff --git a/include/modval.h b/include/modval.h
index c3fe7cb..f845ff8 100644
--- a/include/modval.h
+++ b/include/modval.h
@@ -39,11 +39,8 @@
 #define ip_to_host(x) BX_ip_to_host(x)
 #define host_to_ip(x) BX_host_to_ip(x)
 #define connect_by_number(a, b, c, d, e) BX_connect_by_number(a, b, c, d, e)
-#ifndef __vars_h_
-enum VAR_TYPES { unused };
-#endif
-int  get_int_var (enum VAR_TYPES);
-void ircpanic (char *, ...);
+#define get_int_var(v) BX_get_int_var(v)
+#define ircpanic BX_ircpanic
 char *my_ltoa (long);
 #else
 
diff --git a/source/scr-bx.c b/source/scr-bx.c
index b4b24df..eeff32a 100644
--- a/source/scr-bx.c
+++ b/source/scr-bx.c
@@ -25,6 +25,9 @@
 #include "ircterm.h"
 #include "screen.h"
 #include "ircaux.h"
+#include "vars.h"
+#define STERM_C
+#include "modval.h"
 
 #include <sys/ioctl.h>
 
@@ -90,7 +93,7 @@ void ircpanic(char *string, ...)
 	return;
 }
 
-int get_int_var(int var)
+int get_int_var(enum VAR_TYPES var)
 {
 	return 1;
 }
diff --git a/source/wserv.c b/source/wserv.c
index 7c843b4..1b6a716 100644
--- a/source/wserv.c
+++ b/source/wserv.c
@@ -22,6 +22,7 @@ static	char	rcsid[] = "@(#)$Id$";
 
 #include "ircterm.h"
 #include "ircaux.h"
+#include "vars.h"
 #define WTERM_C
 #include "modval.h"
 #include <errno.h>