diff --git a/ChangeLog b/ChangeLog
index 69f5f175f..6f28b15bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-23  Adam Fedor  <fedor@gnu.org>
+
+	* Source/....m: include config.h
+	* Tools/*.m: Likewise.
+	* Headers/gnustep/base/preface.h.in: Implement VASPRINTF_LENGTH
+	when vasprintf does not return length.
+
 2000-03-23  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
 
 	* Source/NSString.m: ([-initWithFormat:arguments:]) added
diff --git a/Headers/gnustep/base/preface.h.in b/Headers/gnustep/base/preface.h.in
index ff68633f5..e2b4af8a6 100644
--- a/Headers/gnustep/base/preface.h.in
+++ b/Headers/gnustep/base/preface.h.in
@@ -158,7 +158,7 @@ extern const char o_NeXT_cc_version[];
 #if VASPRINTF_RETURNS_LENGTH 
 #define VASPRINTF_LENGTH(VASPF_CALL) (VASPF_CALL)
 #else
-#error /* not implemented yet */
+#define VASPRINTF_LENGTH(VASPF_CALL) strlen((VASPF_CALL))
 #endif /* VSPRINTF_RETURNS_LENGTH */
 
 
diff --git a/Source/GetDefEncoding.m b/Source/GetDefEncoding.m
index 01c0996be..47e6d42b0 100644
--- a/Source/GetDefEncoding.m
+++ b/Source/GetDefEncoding.m
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSBundle.h>
 
diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index bbc9fd2b3..d2f5cfaa8 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -43,6 +43,7 @@
  *		attributes argument and use the values from the string.
  */
 
+#include "config.h"
 #include <base/preface.h>
 #include <base/fast.x>
 #include <base/Unicode.h>
diff --git a/Source/NSGAttributedString.m b/Source/NSGAttributedString.m
index b57f66f08..73fd3a9b3 100644
--- a/Source/NSGAttributedString.m
+++ b/Source/NSGAttributedString.m
@@ -43,6 +43,7 @@
  *		attributes argument and use the values from the string.
  */
 
+#include "config.h"
 #include <base/preface.h>
 #include <Foundation/NSGAttributedString.h>
 #include <Foundation/NSException.h>
diff --git a/Source/NSInvocation.m b/Source/NSInvocation.m
index b2e40d49b..3ad0cae11 100644
--- a/Source/NSInvocation.m
+++ b/Source/NSInvocation.m
@@ -23,6 +23,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
    */ 
 
+#include "config.h"
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSInvocation.h>
diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m
index 30c08a1e9..0308aaab5 100644
--- a/Source/NSNotificationCenter.m
+++ b/Source/NSNotificationCenter.m
@@ -25,6 +25,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
 
+#include "config.h"
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSLock.h>
diff --git a/Source/NSProtocolChecker.m b/Source/NSProtocolChecker.m
index 6d911fb99..2863b5080 100644
--- a/Source/NSProtocolChecker.m
+++ b/Source/NSProtocolChecker.m
@@ -21,6 +21,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
    */ 
 
+#include "config.h"
 #import <Foundation/NSProtocolChecker.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSInvocation.h>
diff --git a/Source/NSUndoManager.m b/Source/NSUndoManager.m
index ef27747ed..7971930be 100644
--- a/Source/NSUndoManager.m
+++ b/Source/NSUndoManager.m
@@ -20,6 +20,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */ 
 
+#include "config.h"
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
diff --git a/Source/o_cbs_char_p.m b/Source/o_cbs_char_p.m
index 72f73dc8d..09724b773 100644
--- a/Source/o_cbs_char_p.m
+++ b/Source/o_cbs_char_p.m
@@ -25,6 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSString.h>
 #include <base/o_cbs.h>
 
diff --git a/Source/o_cbs_id.m b/Source/o_cbs_id.m
index a92c9739f..5d9372260 100644
--- a/Source/o_cbs_id.m
+++ b/Source/o_cbs_id.m
@@ -25,6 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <base/o_cbs.h>
diff --git a/Source/o_cbs_int.m b/Source/o_cbs_int.m
index c36d31db6..b17b50fde 100644
--- a/Source/o_cbs_int.m
+++ b/Source/o_cbs_int.m
@@ -25,6 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSString.h>
 #include <base/o_cbs.h>
 
diff --git a/Source/o_cbs_int_p.m b/Source/o_cbs_int_p.m
index c4cb56c5a..8df1c4b73 100644
--- a/Source/o_cbs_int_p.m
+++ b/Source/o_cbs_int_p.m
@@ -25,6 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSString.h>
 #include <base/o_cbs.h>
 
diff --git a/Source/o_cbs_void_p.m b/Source/o_cbs_void_p.m
index fed078ecb..3fdb88907 100644
--- a/Source/o_cbs_void_p.m
+++ b/Source/o_cbs_void_p.m
@@ -25,6 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <stdlib.h>
+#include "config.h"
 #include <Foundation/NSString.h>
 #include <base/o_cbs.h>
 
diff --git a/Tools/defaults.m b/Tools/defaults.m
index c5bc957d6..773279295 100644
--- a/Tools/defaults.m
+++ b/Tools/defaults.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSDictionary.h>
 #include	<Foundation/NSString.h>
diff --git a/Tools/dread.m b/Tools/dread.m
index 7e657e551..84ec5dabf 100644
--- a/Tools/dread.m
+++ b/Tools/dread.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSDictionary.h>
 #include	<Foundation/NSString.h>
diff --git a/Tools/dremove.m b/Tools/dremove.m
index 6a5c896c9..6570d33a7 100644
--- a/Tools/dremove.m
+++ b/Tools/dremove.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSDictionary.h>
 #include	<Foundation/NSString.h>
diff --git a/Tools/dwrite.m b/Tools/dwrite.m
index 81b8e9ee6..d223814ad 100644
--- a/Tools/dwrite.m
+++ b/Tools/dwrite.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSDictionary.h>
 #include	<Foundation/NSString.h>
diff --git a/Tools/gdnc.m b/Tools/gdnc.m
index 11154298f..edd545e62 100644
--- a/Tools/gdnc.m
+++ b/Tools/gdnc.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSObject.h>
 #include	<Foundation/NSConnection.h>
 #include	<Foundation/NSData.h>
diff --git a/Tools/pldes.m b/Tools/pldes.m
index f885debc1..b6349cd9a 100644
--- a/Tools/pldes.m
+++ b/Tools/pldes.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSData.h>
 #include	<Foundation/NSException.h>
diff --git a/Tools/plparse.m b/Tools/plparse.m
index 435c9fc81..d978e4e5e 100644
--- a/Tools/plparse.m
+++ b/Tools/plparse.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSException.h>
 #include	<Foundation/NSString.h>
diff --git a/Tools/plser.m b/Tools/plser.m
index 4d7343b34..4b77125fe 100644
--- a/Tools/plser.m
+++ b/Tools/plser.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSData.h>
 #include	<Foundation/NSException.h>
diff --git a/Tools/sfparse.m b/Tools/sfparse.m
index 18b94e7cc..064913ece 100644
--- a/Tools/sfparse.m
+++ b/Tools/sfparse.m
@@ -18,6 +18,7 @@
 
    */
 
+#include "config.h"
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSException.h>
 #include	<Foundation/NSString.h>