diff --git a/src/gdd/Makefile b/src/gdd/Makefile
index ccded8be6..1b1750d6b 100644
--- a/src/gdd/Makefile
+++ b/src/gdd/Makefile
@@ -5,6 +5,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.2  1996/06/25 19:18:10  jbk
+# moved from extensions to base - fixed trouble in dbMapper.cc
+#
 # Revision 1.1  1996/06/25 19:11:24  jbk
 # new in EPICS base
 #
@@ -16,10 +19,10 @@
 #
 #
 
-EPICS=../../..
+TOP=../..
 # EPICS=/usr/local/epics/R3.12.2
 
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/src/config/CONFIG_BASE
 
-include $(EPICS)/config/RULES_ARCHS
+include $(TOP)/src/config/RULES_ARCHS
 
diff --git a/src/gdd/Makefile.Unix b/src/gdd/Makefile.Unix
index f14695b81..af68eee80 100644
--- a/src/gdd/Makefile.Unix
+++ b/src/gdd/Makefile.Unix
@@ -5,6 +5,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.2  1996/06/25 19:18:11  jbk
+# moved from extensions to base - fixed trouble in dbMapper.cc
+#
 # Revision 1.1  1996/06/25 19:11:25  jbk
 # new in EPICS base
 #
@@ -20,11 +23,10 @@
 
 VPATH=.:..
 
-EPICS = ../../../..
+TOP= ../../..
 # EPICS = /usr/local/epics/R3.12.2
 
-include Target.include
-include $(EPICS)/config/CONFIG_BASE
+include $(TOP)/src/config/CONFIG_BASE
 
 OPTIM_YES=-g
 ifeq ($(HOST_ARCH),sun4)
@@ -75,5 +77,5 @@ genApps: genApps.o $(LIBOBJS)
 clean::
 	/bin/rm -f aitConvertGenerated.cc aitGen genApps
 
-include $(EPICS)/config/RULES.Unix
+include $(TOP)/src/config/RULES.Unix