diff --git a/ChangeLog b/ChangeLog
index 339d62984..69b567298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-09  Adam Fedor  <fedor@gnu.org>
+
+	* Source/include/NSObjCRuntime.h: Define some OpenStep cpp vars.
+	* Source/include/NSException.h (NS_VALUERETURN): Fix.
+
 Tue Mar  9  5:16:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* configure.in: Added tests for syslog
diff --git a/Headers/gnustep/base/NSException.h b/Headers/gnustep/base/NSException.h
index 15f6b3769..122aabd80 100644
--- a/Headers/gnustep/base/NSException.h
+++ b/Headers/gnustep/base/NSException.h
@@ -118,7 +118,10 @@ extern void _NSRemoveHandler( NSHandler *handler );
 #define NS_VALRETURN(val)  do { typeof(val) temp = (val);	\
 			_NSRemoveHandler(&NSLocalHandler);	\
 			return(temp); } while (0)
-#define NS_VALUERETURN  NS_VALRETURN
+
+#define NS_VALUERETURN(object, id) do { id temp = object;	\
+			_NSRemoveHandler(&NSLocalHandler);	\
+			return(temp); } while (0) 
 
 #define NS_VOIDRETURN	do { _NSRemoveHandler(&NSLocalHandler);	\
 			return; } while (0)
diff --git a/Headers/gnustep/base/NSObjCRuntime.h b/Headers/gnustep/base/NSObjCRuntime.h
index 886edc2ff..3ff1d95a1 100644
--- a/Headers/gnustep/base/NSObjCRuntime.h
+++ b/Headers/gnustep/base/NSObjCRuntime.h
@@ -58,4 +58,7 @@ extern BOOL GSGetInstanceVariable(id obj, NSString *name, void* data);
 extern BOOL GSSetInstanceVariable(id obj, NSString *name, void* data);
 #endif
 
+#define FOUNDATION_EXPORT
+#define FOUNDATION_STATIC_INLINE static inline
+
 #endif /* __NSObjCRuntime_h_GNUSTEP_BASE_INCLUDE */