diff --git a/ChangeLog b/ChangeLog
index 8566cfbe6..8d718f3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-23  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/base/NSLock.h: Fix NeXT_RUNTIME typo.
+	* Headers/gnustep/base/objc-gnu2next.h: Change *_EXPORT to extern
+	* Source/o_vscanf.c: include objc-gnu2next.h
+
 2001-04-24   Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Testing/benchmark.m (bench_object): Use a choice of the 10 more
diff --git a/Headers/gnustep/base/NSLock.h b/Headers/gnustep/base/NSLock.h
index bc2bed9d7..60bd9393f 100644
--- a/Headers/gnustep/base/NSLock.h
+++ b/Headers/gnustep/base/NSLock.h
@@ -32,7 +32,7 @@
 #define _GNUstep_H_NSLock
 
 #include <Foundation/NSObject.h>
-#ifdef NeXT_RUNTIMME
+#ifdef NeXT_RUNTIME
 #include <base/thr-mach.h>
 #endif
 
diff --git a/Headers/gnustep/base/objc-gnu2next.h b/Headers/gnustep/base/objc-gnu2next.h
index c902b3275..110029260 100644
--- a/Headers/gnustep/base/objc-gnu2next.h
+++ b/Headers/gnustep/base/objc-gnu2next.h
@@ -131,12 +131,12 @@ objc_free(void *mem);
 ** Users should call the normal objc routines above for
 ** memory allocation and disposal within their programs.
 */
-objc_EXPORT void *(*_objc_malloc)(size_t);
-objc_EXPORT void *(*_objc_atomic_malloc)(size_t);
-objc_EXPORT void *(*_objc_valloc)(size_t);
-objc_EXPORT void *(*_objc_realloc)(void *, size_t);
-objc_EXPORT void *(*_objc_calloc)(size_t, size_t);
-objc_EXPORT void (*_objc_free)(void *);
+extern void *(*_objc_malloc)(size_t);
+extern void *(*_objc_atomic_malloc)(size_t);
+extern void *(*_objc_valloc)(size_t);
+extern void *(*_objc_realloc)(void *, size_t);
+extern void *(*_objc_calloc)(size_t, size_t);
+extern void (*_objc_free)(void *);
 
 #endif /* NeXT_RUNTIME */
 
diff --git a/Source/o_vscanf.c b/Source/o_vscanf.c
index 0c8943c7f..dc8fb2f49 100644
--- a/Source/o_vscanf.c
+++ b/Source/o_vscanf.c
@@ -60,6 +60,7 @@ Cambridge, MA 02111, USA.  */
 #include <stdlib.h>
 #include <string.h>
 #include <objc/objc-api.h>
+#include <base/objc-gnu2next.h>
 
 extern double strtod(const char *str, char **ptr);
 extern long strtol(const char *str, char** ptr, int base);