Index: libcfa/src/parseconfig.cfa
===================================================================
--- libcfa/src/parseconfig.cfa	(revision 58ebd786563c5b45bf5b0fa563869710e1f84198)
+++ libcfa/src/parseconfig.cfa	(revision 8f01cb044a9ffc7d221d0616b56582f558ce5158)
@@ -1,4 +1,4 @@
 #include <fstream.hfa>
-#include <heap.hfa>
+#include <parseargs.hfa>
 #include "parseconfig.hfa"
 
@@ -91,70 +91,4 @@
 
 
-//-----------------------------------------------------------------------------
-// Typed argument parsing
-
-bool parse( const char * arg, const char * & value ) {
-	value = arg;
-	return true;
-}
-
-bool parse( const char * arg, int & value ) {
-	char * end;
-	int r = strtoll( arg, &end, 10 );
-  if ( *end != '\0' ) return false;
-
-	value = r;
-	return true;
-}
-
-bool parse( const char * arg, unsigned & value ) {
-	char * end;
-	unsigned long long int r = strtoull( arg, &end, 10 );
-  if ( *end != '\0' ) return false;
-  if ( r > (unsigned)MAX ) return false;
-
-	value = r;
-	return true;
-}
-
-bool parse( const char * arg, unsigned long & value ) {
-	char * end;
-	unsigned long long int r = strtoull( arg, &end, 10 );
-  if ( *end != '\0' ) return false;
-  if ( r > (unsigned long)MAX ) return false;
-
-	value = r;
-	return true;
-}
-
-bool parse( const char * arg, unsigned long long & value ) {
-	char * end;
-	unsigned long long int r = strtoull( arg, &end, 10 );
-  if ( *end != '\0' ) return false;
-  if ( r > (unsigned long long)MAX ) return false;
-
-	value = r;
-	return true;
-}
-
-bool parse( const char * arg, float & value ) {
-	char * end;
-	float r = strtof( arg, &end );
-  if ( *end != '\0' ) return false;
-
-	value = r;
-	return true;
-}
-
-bool parse( const char * arg, double & value ) {
-	char * end;
-	double r = strtod( arg, &end );
-  if ( *end != '\0' ) return false;
-
-	value = r;
-	return true;
-}
-
-
 // Local Variables: //
 // tab-width: 4 //