diff --git a/src/test_exception_sim.c b/src/test_exception_sim.c
index 7c9872e..31ee129 100644
--- a/src/test_exception_sim.c
+++ b/src/test_exception_sim.c
@@ -1,8 +1,9 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <libsys.h>
-#include <irq.h>
-#include "xcpt.h"
+#include <libsys/libsys.h>
+#include <libsys/irq.h>
+#include <libsys/xcpt.h>
+
 #define MAX_NUM_EXCEPTIONS	10
 
 void *g_fp_badsubs[MAX_NUM_EXCEPTIONS];
diff --git a/src/testbench_denano.c b/src/testbench_denano.c
index 1cf6668..933cc2e 100644
--- a/src/testbench_denano.c
+++ b/src/testbench_denano.c
@@ -1,13 +1,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <math.h>
 #include <time.h>
 #include <sys/times.h>
 #include <sys/time.h>
-#include <libsys.h>
-#include <gpio.h>
-#include <irq.h>
+#include <libsys/libsys.h>
+#include <libsys/cop0.h>
+#include <libsys/gpio.h>
+#include <libsys/irq.h>
+#include <libsys/console.h>
 
 #define	TEST10_ERROR	(ERROR | 0x1000)
 #define	TEST11_ERROR	(ERROR | 0x1100)
@@ -18,6 +21,8 @@
 #define	TEST16_ERROR	(ERROR | 0x1600)
 
 extern int paranoia(int argc, char **argv);
+extern int calibrate_delay(void);
+
 gpio_if_t gpio_led_data;
 gpio_if_t gpio_led_dir;