diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 05137464024b796d154e7322f0e002ab68557f65..b1d4d08c76c4445be915b4ece37e11876b7c2b1f 100755
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -6,9 +6,8 @@ ZMap/zmapConfig.h \
 ZMap/zmapConfigDir.h \
 ZMap/zmapConfigIni.h \
 ZMap/zmapConfigKeyboard.h \
-ZMap/zmapConfigLoader.h \
 ZMap/zmapConfigStrings.h \
-ZMap/zmapConfigStanzas.h \
+ZMap/zmapConfigStanzaStructs.h \
 ZMap/zmapConfigStyleDefaults.h \
 ZMap/zmapControl.h \
 ZMap/zmapDAS.h \
diff --git a/src/include/ZMap/zmapConfigIni.h b/src/include/ZMap/zmapConfigIni.h
index 138f10ece8bb11ad19b2944650f636b96a45080d..ea0324583f279844b19122299d58496890f71f9f 100755
--- a/src/include/ZMap/zmapConfigIni.h
+++ b/src/include/ZMap/zmapConfigIni.h
@@ -29,7 +29,7 @@
  * HISTORY:
  * Last edited: May 26 14:53 2009 (edgrif)
  * Created: Thu Sep 11 10:40:13 2008 (rds)
- * CVS info:   $Id: zmapConfigIni.h,v 1.8 2009-12-14 16:37:59 mh17 Exp $
+ * CVS info:   $Id: zmapConfigIni.h,v 1.9 2009-12-15 09:21:41 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -146,4 +146,7 @@ GList *zMapConfigIniContextGetStyleList(ZMapConfigIniContext context,char *style
 
 gboolean zMapConfigIniGetStylesFromFile(char *styles_list, char *styles_file, GData **styles_out);
 
+void zMapConfigSourcesFreeList(GList *config_sources_list);
+void zMapConfigStylesFreeList(GList *config_styles_list);
+
 #endif /* ZMAP_CONFIG_INI_H */
diff --git a/src/zmapGFF/gffparser.c b/src/zmapGFF/gffparser.c
index 25c0913956c77f2377a4d2a2ca7c4749dd03cd72..a377c08f419f1803b1cb42228b91619254edbea3 100755
--- a/src/zmapGFF/gffparser.c
+++ b/src/zmapGFF/gffparser.c
@@ -29,7 +29,7 @@
  * HISTORY:
  * Last edited: Nov 19 15:23 2009 (edgrif)
  * Created: Wed Jan 11 11:30:39 2006 (rds)
- * CVS info:   $Id: gffparser.c,v 1.8 2009-12-14 11:42:22 mh17 Exp $
+ * CVS info:   $Id: gffparser.c,v 1.9 2009-12-15 09:19:56 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -39,7 +39,7 @@
 #include <ZMap/zmapGFF.h>
 #include <ZMap/zmapConfigDir.h>
 #include <ZMap/zmapConfigIni.h>
-#include <ZMap/zmapConfigLoader.h>
+
 
 typedef struct
 {