diff --git a/Makefile b/Makefile
index ef87776..702492a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ MCFG=include/Makefile.config
 
 ifneq ($(MAKECMDGOALS),clean)
 # make sure Classdesc is built first, even before starting to include Makefiles
-build_classdesc:=$(shell if [ ! -x bin/classdesc ]; then cd classdesc; $(MAKE) PREFIX=$(ECOLAB_HOME) XDR=$(XDR) install; fi)
+build_classdesc:=$(shell if [ ! -x bin/classdesc ]; then cd classdesc; $(MAKE) XDR=$(XDR); fi)
 endif
 
 include include/Makefile
@@ -185,16 +185,14 @@ lib:
 bin: 
 	-mkdir -p bin
 
-
-lib/libecolab$(ECOLIBS_EXT).a: $(OBJS) $(LIBMODS)
+lib/libecolab$(ECOLIBS_EXT).a: $(OBJS) $(LIBMODS) graphcode
 # build graphcode objects
 	-cd graphcode; $(GRAPHCODE_MAKE) libgraphcode.a
-	-cp -f graphcode/*.h include
-	ar r $@ $^ graphcode/*.o
+	ar r $@ $(OBJS) $(LIBMODS) graphcode/*.o
 ifeq ($(OS),Darwin)
 	ranlib $@
 endif
-	$(CPLUSPLUS) -shared -Wl,-soname,libecolab$(ECOLIBS_EXT).so.$(SOVERSION)  $^ graphcode/*.o $(LIBS) -o lib/libecolab$(ECOLIBS_EXT).so.$(SOVERSION)
+	$(CPLUSPLUS) -shared -Wl,-soname,libecolab$(ECOLIBS_EXT).so.$(SOVERSION)  $(OBJS) $(LIBMODS) graphcode/*.o $(LIBS) -o lib/libecolab$(ECOLIBS_EXT).so.$(SOVERSION)
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) libecolab$(ECOLIBS_EXT).so
 	cd lib; ln -sf libecolab$(ECOLIBS_EXT).so.$(SOVERSION) ecolab$(ECOLIBS_EXT).so
 
@@ -268,6 +266,8 @@ install: all-without-models
 	if [ -f $(PREFIX)/include/version.h ] && ! diff -q $(PREFIX)/include/version.h include/version.h; then rm -rf $(PREFIX); fi
 	mkdir -p $(PREFIX)
 	cp -r include $(PREFIX)
+	cp classdesc/*.{h,cd} $(PREFIX)/include
+	cp graphcode/*.{h,cd} $(PREFIX)/include
 # ensure cd files are more up-to-date than their sources.
 	touch $(PREFIX)/include/*.cd
 # fix up unpack_base.h
diff --git a/classdesc b/classdesc
index 7701bf3..aa059c0 160000
--- a/classdesc
+++ b/classdesc
@@ -1 +1 @@
-Subproject commit 7701bf30bb818af2ef262ce060148e14d7eb641b
+Subproject commit aa059c01ba1461114b517bdd16fcf332214e529b
diff --git a/include/Makefile b/include/Makefile
index 8ecc6cd..dc14a2e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -182,7 +182,7 @@ ECOLIBS=$(ECOLAB_HOME)/lib/libecolab$(ECOLIBS_EXT).a
 
 # why is boost_thread required here?
 LIBS+=-L$(ECOLAB_HOME)/lib -lecolab$(ECOLIBS_EXT) -lboost_thread
-FLAGS+=-I. -I$(ECOLAB_HOME)/include -DHASH_TCL_hash
+FLAGS+=-I. -I$(ECOLAB_HOME)/classdesc -I$(ECOLAB_HOME)/include -DHASH_TCL_hash
 
 # The following section uses GNU Make specific syntax. If not using
 # GNU Make, edit the  FLAGS, LIBS, CC,
diff --git a/include/ecolab_epilogue.h b/include/ecolab_epilogue.h
index c91f9cf..9c06f02 100644
--- a/include/ecolab_epilogue.h
+++ b/include/ecolab_epilogue.h
@@ -13,4 +13,5 @@ Put this after including all .cd files
 */
 #include "classdesc_epilogue.h"
 #ifdef GRAPHCODE_H
+#include "graphcode.cd"
 #endif