diff --git a/configfile.h b/configfile.h
index 580c0a6..efc2b56 100644
--- a/configfile.h
+++ b/configfile.h
@@ -1,6 +1,10 @@
 #ifndef __CONFIGFILE_H
 #define __CONFIGFILE_H
-#include "types.h"
+#include <exec/types.h>
+#include <dos/dos.h>
+#include <proto/containerkit.h>
+typedef APTR CONFIGFILEPTR;
+
 CONFIGFILEPTR ConfigFileRead(CONST_STRPTR filename);
 VOID ConfigFileFree(CONFIGFILEPTR configFile);
 
@@ -27,6 +31,6 @@ VOID ConfigFileDump(CONFIGFILEPTR configFile);
 VOID ConfigFileSave(CONFIGFILEPTR configFile);
 VOID ConfigFileWrite(CONFIGFILEPTR abstractConfigFile, BPTR file);
 
-StringArray ConfigFileSubsectionsForSection(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR primarySection);
+Array ConfigFileSubsectionsForSection(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR primarySection);
 
 #endif
\ No newline at end of file
diff --git a/smakefile b/smakefile
index 9e8ea86..703ecea 100644
--- a/smakefile
+++ b/smakefile
@@ -11,8 +11,11 @@ LIBS = lib:sc.lib lib:amiga.lib lib:debug.lib
 
 ###############################################################################
 	
-$(NAME) : main.o configfile.o configmodel.o sectionstore.o cregex/cregex.lib containers/containers.lib
-	slink lib:c.o main.o configfile.o configmodel.o sectionstore.o to $(NAME) noicons lib $(LIBS) cregex/cregex.lib containers/containers.lib $(LFLAGS)
+$(NAME) : main.o configfile.lib configfile.h
+	slink lib:c.o main.o to $(NAME) noicons lib $(LIBS) configfile.lib $(LFLAGS)
+
+configfile.lib : configfile.o configmodel.o sectionstore.o cregex/cregex.lib containers/containers.lib
+	JOIN configfile.o configmodel.o sectionstore.o cregex/cregex.lib containers/containers.lib AS configfile.lib 
 
 cregex/cregex.lib : cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o
 	JOIN cregex/pattern.o cregex/cregex_compile.o cregex/cregex_parse.o cregex/cregex_vm.o AS cregex/cregex.lib
@@ -24,7 +27,7 @@ clean:
 	delete \#?.o $(NAME) ALL QUIET
 
 cleanlibs:
-	delete containers/containers.lib containers/\#?.o cregex/cregex.lib cregex/\#?.o ALL QUIET
+	delete configfile.lib containers/containers.lib containers/\#?.o cregex/cregex.lib cregex/\#?.o ALL QUIET
 
 ###############################################################################
 
diff --git a/types.h b/types.h
index da9d7cd..21e6509 100644
--- a/types.h
+++ b/types.h
@@ -9,7 +9,6 @@ typedef APTR SECTIONSTOREPTR;
 typedef APTR LINEPTR;
 typedef APTR SECTIONPTR;
 typedef APTR VARIABLEPTR;
-typedef APTR CONFIGFILEPTR;
 
 typedef APTR PATTERNPTR;