diff --git a/ChangeLog b/ChangeLog
index a0e7cc68b..b0c195920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-28  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/Additions/Unicode.m: Remove unnecessary include of Foundation.h
+	* Source/Additions/GCDictionary.m: ditto
+	* Source/Additions/GCObject.m: ditto
+	* Source/Additions/GCArray.m: ditto
+	* Source/Additions/GSXML.m: ditto
+	* Source/Additions/GSFunctions.m: ditto
+	* Source/Additions/GSObjCRuntime.m: ditto
+	* Headers/Foundation/Foundation.h.install: obsolete file ... removed
+	* Source/Makefile.postamble: Don't install obsolete Foundation.h.install
+	header ... we no longer include Foundation.h anywhere so there's no
+	need to protect against getting the installed version.
+
 2010-11-19  Niels Grewe <niels.grewe@halbordnung.de>
 
 	* Source/NSRegularExpression.m: Rearrange for non-C99 compliant
diff --git a/Headers/Foundation/Foundation.h.install b/Headers/Foundation/Foundation.h.install
deleted file mode 100644
index 93e032c98..000000000
--- a/Headers/Foundation/Foundation.h.install
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-   Global include file for the GNUstep Base Library.
-
-   Copyright (C) 1997 Free Software Foundation, Inc.
-
-   Written by:  Scott Christley <scottc@net-community.com>
-   Date: Sep 1997
-   
-   This file is part of the GNUstep Base Library.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02111 USA.
-   */ 
-
-#ifndef __Foundation_h_GNUSTEP_BASE_INCLUDE
-#define __Foundation_h_GNUSTEP_BASE_INCLUDE
-
-#import	<GNUstepBase/GSVersionMacros.h>
-#import	<objc/objc.h>
-
-#import	<Foundation/FoundationErrors.h>
-#import	<Foundation/NSObjCRuntime.h>
-#import <GNUstepBase/GSConfig.h>
-#import	<Foundation/NSDebug.h>
-#import	<Foundation/NSObject.h>
-
-#import	<Foundation/NSAffineTransform.h>
-#import	<Foundation/NSArchiver.h>
-#import	<Foundation/NSArray.h>
-#import	<Foundation/NSAttributedString.h>
-#import	<Foundation/NSAutoreleasePool.h>
-#import	<Foundation/NSBundle.h>
-#import	<Foundation/NSByteOrder.h>
-#import	<Foundation/NSCache.h>
-#import	<Foundation/NSCalendarDate.h>
-#import	<Foundation/NSCharacterSet.h>
-#import	<Foundation/NSClassDescription.h>
-#import	<Foundation/NSCoder.h>
-#import	<Foundation/NSComparisonPredicate.h>
-#import	<Foundation/NSCompoundPredicate.h>
-#import	<Foundation/NSConnection.h>
-#import	<Foundation/NSData.h>
-#import	<Foundation/NSDateFormatter.h>
-#import	<Foundation/NSDate.h>
-#import	<Foundation/NSDecimalNumber.h>
-#import	<Foundation/NSDictionary.h>
-#import	<Foundation/NSDistantObject.h>
-#import	<Foundation/NSDistributedLock.h>
-#import	<Foundation/NSDistributedNotificationCenter.h>
-#import	<Foundation/NSEnumerator.h>
-#import	<Foundation/NSError.h>
-#import	<Foundation/NSException.h>
-#import	<Foundation/NSExpression.h>
-#import	<Foundation/NSFileHandle.h>
-#import	<Foundation/NSFileManager.h>
-#import	<Foundation/NSFormatter.h>
-#import	<Foundation/NSGarbageCollector.h>
-#import	<Foundation/NSGeometry.h>
-#import	<Foundation/NSHashTable.h>
-#import	<Foundation/NSHost.h>
-#import	<Foundation/NSHTTPCookie.h>
-#import	<Foundation/NSHTTPCookieStorage.h>
-#import	<Foundation/NSIndexPath.h>
-#import	<Foundation/NSIndexSet.h>
-#import	<Foundation/NSInvocation.h>
-#import	<Foundation/NSKeyedArchiver.h>
-#import	<Foundation/NSKeyValueCoding.h>
-#import	<Foundation/NSKeyValueObserving.h>
-#import	<Foundation/NSLocale.h>
-#import	<Foundation/NSLock.h>
-#import	<Foundation/NSMapTable.h>
-#import	<Foundation/NSMethodSignature.h>
-#import	<Foundation/NSNotification.h>
-#import	<Foundation/NSNotificationQueue.h>
-#import	<Foundation/NSNetServices.h>
-#import	<Foundation/NSNull.h>
-#import	<Foundation/NSNumberFormatter.h>
-#import	<Foundation/NSOperation.h>
-#import	<Foundation/NSPathUtilities.h>
-#import	<Foundation/NSPointerArray.h>
-#import	<Foundation/NSPointerFunctions.h>
-#import	<Foundation/NSPortCoder.h>
-#import	<Foundation/NSPortMessage.h>
-#import	<Foundation/NSPortNameServer.h>
-#import	<Foundation/NSPredicate.h>
-#import	<Foundation/NSProcessInfo.h>
-#import	<Foundation/NSProtocolChecker.h>
-#import	<Foundation/NSProxy.h>
-#import	<Foundation/NSRange.h>
-#import	<Foundation/NSRegularExpression.h>
-#import	<Foundation/NSRunLoop.h>
-#import	<Foundation/NSScanner.h>
-#import	<Foundation/NSSerialization.h>
-#import	<Foundation/NSSet.h>
-#import	<Foundation/NSSortDescriptor.h>
-#import	<Foundation/NSSpellServer.h>
-#import	<Foundation/NSStream.h>
-#import	<Foundation/NSString.h>
-#import	<Foundation/NSTask.h>
-#import <Foundation/NSTextCheckingResult.h>
-#import	<Foundation/NSThread.h>
-#import	<Foundation/NSTimer.h>
-#import	<Foundation/NSTimeZone.h>
-#import	<Foundation/NSUndoManager.h>
-#import	<Foundation/NSURLAuthenticationChallenge.h>
-#import	<Foundation/NSURLCache.h>
-#import	<Foundation/NSURLConnection.h>
-#import	<Foundation/NSURLCredential.h>
-#import	<Foundation/NSURLCredentialStorage.h>
-#import	<Foundation/NSURLDownload.h>
-#import	<Foundation/NSURLError.h>
-#import	<Foundation/NSURL.h>
-#import	<Foundation/NSURLHandle.h>
-#import	<Foundation/NSURLProtectionSpace.h>
-#import	<Foundation/NSURLProtocol.h>
-#import	<Foundation/NSURLRequest.h>
-#import	<Foundation/NSURLResponse.h>
-#import	<Foundation/NSUserDefaults.h>
-#import	<Foundation/NSValue.h>
-#import	<Foundation/NSValueTransformer.h>
-#import <Foundation/NSXMLDocument.h>
-#import <Foundation/NSXMLDTD.h>
-#import <Foundation/NSXMLDTDNode.h>
-#import <Foundation/NSXMLElement.h>
-#import <Foundation/NSXMLNode.h>
-#import <Foundation/NSXMLNodeOptions.h>
-#import	<Foundation/NSXMLParser.h>
-#import	<Foundation/NSZone.h>
-
-#endif /* __Foundation_h_GNUSTEP_BASE_INCLUDE */
diff --git a/Source/Additions/GCArray.m b/Source/Additions/GCArray.m
index b17ae0f87..e8cf57224 100644
--- a/Source/Additions/GCArray.m
+++ b/Source/Additions/GCArray.m
@@ -29,8 +29,6 @@
 #ifndef NeXT_Foundation_LIBRARY
 #import "Foundation/NSException.h"
 #import "Foundation/NSRange.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 
 #import "GNUstepBase/GSObjCRuntime.h"
diff --git a/Source/Additions/GCDictionary.m b/Source/Additions/GCDictionary.m
index 1061c42ed..0ca320a3e 100644
--- a/Source/Additions/GCDictionary.m
+++ b/Source/Additions/GCDictionary.m
@@ -27,8 +27,6 @@
 #import "common.h"
 #ifndef NeXT_Foundation_LIBRARY
 #import "Foundation/NSException.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 
 #import "GNUstepBase/GSObjCRuntime.h"
diff --git a/Source/Additions/GCObject.m b/Source/Additions/GCObject.m
index b8cb21916..331b4c867 100644
--- a/Source/Additions/GCObject.m
+++ b/Source/Additions/GCObject.m
@@ -33,8 +33,6 @@
 #import "Foundation/NSAutoreleasePool.h"
 #import "Foundation/NSNotification.h"
 #import "Foundation/NSThread.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 
 #import "GNUstepBase/GCObject.h"
diff --git a/Source/Additions/GSFunctions.m b/Source/Additions/GSFunctions.m
index cc75f0fd0..752cf09da 100644
--- a/Source/Additions/GSFunctions.m
+++ b/Source/Additions/GSFunctions.m
@@ -35,8 +35,6 @@
 #import "Foundation/NSEnumerator.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSFileManager.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 
 NSString *
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index 00d1220c9..a923175b8 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -44,8 +44,6 @@
 #import "Foundation/NSNull.h"
 #import "Foundation/NSSet.h"
 #import "Foundation/NSValue.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 #import "GNUstepBase/GSObjCRuntime.h"
 
diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m
index efce5a818..adbc04292 100644
--- a/Source/Additions/GSXML.m
+++ b/Source/Additions/GSXML.m
@@ -4148,8 +4148,6 @@ static BOOL warned = NO; if (warned == NO) { warned = YES; NSLog(@"WARNING, use
 #ifndef NeXT_Foundation_LIBRARY
 #import	"Foundation/NSCoder.h"
 #import	"Foundation/NSInvocation.h"
-#else
-#import <Foundation/Foundation.h>
 #endif
 
 /*
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index 9b9e87958..184b7e4e4 100644
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@@ -29,9 +29,7 @@
 */
 
 #import "common.h"
-#if	defined(NeXT_Foundation_LIBRARY)
-#import <Foundation/Foundation.h>
-#else
+#if	!defined(NeXT_Foundation_LIBRARY)
 #import "Foundation/NSArray.h"
 #import "Foundation/NSBundle.h"
 #import "Foundation/NSDictionary.h"
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index d9fd383a2..546f1aafd 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -42,11 +42,7 @@ before-all::  $(GENERATED_HFILES)
 after-all:: Info-gnustep.plist
 
 # Things to do before installing
-before-install::
-	cp ../Headers/Foundation/Foundation.h \
-	../Headers/Foundation/Foundation.h.saved
-	cp ../Headers/Foundation/Foundation.h.install \
-	../Headers/Foundation/Foundation.h
+#before-install::
 
 # Things to do after installing
 #
diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m
index 0fbabd3ec..060bee480 100644
--- a/Source/NSCalendarDate.m
+++ b/Source/NSCalendarDate.m
@@ -1200,13 +1200,15 @@ static inline int getDigits(const char *from, char *to, int limit, BOOL *error)
 		    break;
 
 		  case 'S':
-		    sourceIdx += getDigits(&source[sourceIdx], tmpStr, 2, &error);
+		    sourceIdx
+		      += getDigits(&source[sourceIdx], tmpStr, 2, &error);
 		    sec = atoi(tmpStr);
 		    had |= hads;
 		    break;
 
 		  case 'w':
-		    sourceIdx += getDigits(&source[sourceIdx], tmpStr, 1, &error);
+		    sourceIdx
+		      += getDigits(&source[sourceIdx], tmpStr, 1, &error);
 		    dayOfWeek = atoi(tmpStr);
 		    had |= hadw;
 		    break;
@@ -1214,7 +1216,8 @@ static inline int getDigits(const char *from, char *to, int limit, BOOL *error)
 		  case 'W': // Fall through
 		    weekStartsMonday = 1;
 		  case 'U':
-		    sourceIdx += getDigits(&source[sourceIdx], tmpStr, 1, &error);
+		    sourceIdx
+		      += getDigits(&source[sourceIdx], tmpStr, 1, &error);
 		    julianWeeks = atoi(tmpStr);
 		    break;
 
@@ -1225,7 +1228,8 @@ static inline int getDigits(const char *from, char *to, int limit, BOOL *error)
 		    //	break;
 
 		  case 'y':
-		    sourceIdx += getDigits(&source[sourceIdx], tmpStr, 2, &error);
+		    sourceIdx
+		      += getDigits(&source[sourceIdx], tmpStr, 2, &error);
 		    year = atoi(tmpStr);
 		    if (year >= 70)
 		      {
@@ -1239,7 +1243,8 @@ static inline int getDigits(const char *from, char *to, int limit, BOOL *error)
 		    break;
 
 		  case 'Y':
-		    sourceIdx += getDigits(&source[sourceIdx], tmpStr, 4, &error);
+		    sourceIdx
+		      += getDigits(&source[sourceIdx], tmpStr, 4, &error);
 		    year = atoi(tmpStr);
 		    had |= hadY;
 		    break;