diff --git a/EOAdaptors/Postgres95/Postgres95Adaptor.m b/EOAdaptors/Postgres95/Postgres95Adaptor.m
index 03bb67e..3a926e5 100644
--- a/EOAdaptors/Postgres95/Postgres95Adaptor.m
+++ b/EOAdaptors/Postgres95/Postgres95Adaptor.m
@@ -48,7 +48,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSDate.h>
 #import <Foundation/NSAutoreleasePool.h>
 
-#import <extensions/NSException.h>
+#include <Foundation/NSException.h>
 
 #import <EOAccess/EOAccess.h>
 #import <EOAccess/EOAttribute.h>
diff --git a/EOAdaptors/Postgres95/Postgres95Channel.m b/EOAdaptors/Postgres95/Postgres95Channel.m
index 5824eed..360a28d 100644
--- a/EOAdaptors/Postgres95/Postgres95Channel.m
+++ b/EOAdaptors/Postgres95/Postgres95Channel.m
@@ -45,8 +45,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSObjCRuntime.h>
 #import <Foundation/NSUtilities.h>
 
-#import <extensions/NSException.h>
-#import <extensions/exceptions/GeneralExceptions.h>
+#include <Foundation/NSException.h>
 
 #import <EOAccess/EOAccess.h>
 
diff --git a/EOAdaptors/Postgres95/Postgres95SQLExpression.m b/EOAdaptors/Postgres95/Postgres95SQLExpression.m
index 33700df..9058746 100644
--- a/EOAdaptors/Postgres95/Postgres95SQLExpression.m
+++ b/EOAdaptors/Postgres95/Postgres95SQLExpression.m
@@ -37,7 +37,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/Foundation.h>
 #import <Foundation/NSUtilities.h>
 
-#import <extensions/NSException.h>
+#include <Foundation/NSException.h>
 
 #import <EOAccess/EOAccess.h>
 
diff --git a/EOAdaptors/Postgres95/Postgres95Values.m b/EOAdaptors/Postgres95/Postgres95Values.m
index 5655985..3954f1a 100644
--- a/EOAdaptors/Postgres95/Postgres95Values.m
+++ b/EOAdaptors/Postgres95/Postgres95Values.m
@@ -38,7 +38,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
-#import <extensions/NSException.h>
+#include <Foundation/NSException.h>
 
 #import <EOAccess/EOAccess.h>
 #import <EOAccess/EOAttribute.h>
diff --git a/Tools/Makefile.preamble b/Tools/Makefile.preamble
index fe7f568..b72db50 100644
--- a/Tools/Makefile.preamble
+++ b/Tools/Makefile.preamble
@@ -49,9 +49,9 @@ ADDITIONAL_INCLUDE_DIRS = -I..
 
 # Additional LDFLAGS to pass to the linker
 ifeq ($(debug), yes)
-	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lFoundationExt_d -lgnustep-db2_d -lgnustep-db2control_d
+	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lgnustep-db2_d -lgnustep-db2control_d
 else
-	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lFoundationExt -lgnustep-db2 -lgnustep-db2control
+	ADDITIONAL_LDFLAGS := $(ADDITIONAL_LDFLAGS) -lgnustep-db2 -lgnustep-db2control
 endif
 
 # Additional library directories the linker should search