diff --git a/tmcd/GNUmakefile.in b/tmcd/GNUmakefile.in
index 2dc1b1201a74de8c6c5d05c9b4624e01f204414f..546986d73e5206b86b5478fb44057d43d18e30cb 100644
--- a/tmcd/GNUmakefile.in
+++ b/tmcd/GNUmakefile.in
@@ -12,8 +12,7 @@ all:	tmcd tmcc tmcd.restart findif
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-CFLAGS	+= -O -g -DUDP -DTBDBNAME='"$(TBDBNAME)"' -I/usr/local/include \
-	-DFSNODE='"$(FSNODE)"' -DBOSSNODE='"$(BOSSNODE)"'
+CFLAGS	+= -O -g -DUDP -I${OBJDIR} -I/usr/local/include
 
 tmcd: tmcd.o
 	$(CC) $(CFLAGS) -o tmcd tmcd.o \
diff --git a/tmcd/tmcc.c b/tmcd/tmcc.c
index a92676379e835bb810dc08169473d6d171d209a4..94613f56a5b57c5582a801e6340d572bf076afb0 100644
--- a/tmcd/tmcc.c
+++ b/tmcd/tmcc.c
@@ -17,6 +17,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include "decls.h"
+#include "config.h"
 
 #undef BOSSNODE
 
diff --git a/tmcd/tmcd.c b/tmcd/tmcd.c
index 40df0907198589529431887867ac3c48ba8c0133..893f84f86eeb8e691f3154e28d27238472b4a24f 100644
--- a/tmcd/tmcd.c
+++ b/tmcd/tmcd.c
@@ -13,13 +13,14 @@
 #include <assert.h>
 #include <mysql/mysql.h>
 #include "decls.h"
+#include "config.h"
 
 /*
  * XXX This needs to be localized!
  */
-#define FSPROJDIR	FSNODE ":/q/proj"
-#define FSGROUPDIR	FSNODE ":/q/groups"
-#define FSUSERDIR	FSNODE ":/users"
+#define FSPROJDIR	FSNODE ":" FSDIR_PROJ
+#define FSGROUPDIR	FSNODE ":" FSDIR_GROUPS
+#define FSUSERDIR	FSNODE ":" FSDIR_USERS
 #define PROJDIR		"/proj"
 #define GROUPDIR	"/groups"
 #define USERDIR		"/users"