diff --git a/Makefile.am b/Makefile.am
index edd9f9a..ea94da2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -214,8 +214,8 @@ GenOrdAST_SOURCES = pregen/GenOrdAST.hs $(pregen_sources)
 GenTagAST_SOURCES = pregen/GenTagAST.hs $(pregen_sources)
 
 rangetest_SOURCES = rangetest.c
-rangetest_CFLAGS = -Wall
-rangetest_LDFLAGS = -lm
+rangetest_CFLAGS = -Wall $(TOCK_CFLAGS)
+rangetest_LDFLAGS = -lm $(TOCK_CLDFLAGS)
 
 #The programs to actually build:	
 bin_PROGRAMS = tock
diff --git a/rangetest.c b/rangetest.c
index 99deb5e..8f32346 100644
--- a/rangetest.c
+++ b/rangetest.c
@@ -3,7 +3,7 @@ int g_stopped;
 #define occam_stop(pos, nargs, format, args...) do { g_stopped = 1; } while (0)
 
 #define occam_INT_size SIZEOF_INT
-#include "support/tock_support.h"
+#include "support/tock_support_cif.h"
 
 #define report_failure(msg, args...) { printf(msg, ##args); }