diff -u -r gnustep-dl2-0.11.0-orig/EOAccess/EODatabaseDataSource.m gnustep-dl2-0.11.0/EOAccess/EODatabaseDataSource.m
--- gnustep-dl2-0.11.0-orig/EOAccess/EODatabaseDataSource.m	2006-09-14 10:06:21.000000000 -0600
+++ gnustep-dl2-0.11.0/EOAccess/EODatabaseDataSource.m	2009-02-16 10:11:39.000000000 -0700
@@ -193,9 +193,11 @@
 {
   EOObjectStore *store;
   NSString *entityName = [_fetchSpecification entityName];
-  static SEL modelGroupSel = @selector(modelGroup);
+  static SEL modelGroupSel;
   EOModelGroup *modelGroup = nil;
   
+  if (modelGroupSel == NULL)
+    modelGroupSel = @selector(modelGroup);
   store = [_editingContext rootObjectStore];
   
   if ([store isKindOfClass: [EOObjectStoreCoordinator class]])
diff -u -r gnustep-dl2-0.11.0-orig/EOAccess/EOUtilities.m gnustep-dl2-0.11.0/EOAccess/EOUtilities.m
--- gnustep-dl2-0.11.0-orig/EOAccess/EOUtilities.m	2007-01-01 04:52:38.000000000 -0700
+++ gnustep-dl2-0.11.0/EOAccess/EOUtilities.m	2009-02-16 10:12:40.000000000 -0700
@@ -76,7 +76,9 @@
 #include "EOPrivate.h"
 
 NSString *EOMoreThanOneException = @"EOMoreThanOneException";
+#ifdef GNUSTEP
 NSString *NSObjectNotAvailableException = @"NSObjectNotAvailableException";
+#endif
 
 
 @implementation EOEditingContext (EOUtilities)
diff -u -r gnustep-dl2-0.11.0-orig/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m
--- gnustep-dl2-0.11.0-orig/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m	2007-01-03 15:09:56.000000000 -0700
+++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m	2009-02-16 10:14:04.000000000 -0700
@@ -27,6 +27,9 @@
 #include "SQLite3LoginPanel.h"
 
 #import <AppKit/AppKit.h>
+#ifndef GNUSTEP
+#include <GNUstepBase/GNUstep.h>
+#endif
 
 static BOOL insideModalLoop = YES;
 
diff -u -r gnustep-dl2-0.11.0-orig/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.h gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.h
--- gnustep-dl2-0.11.0-orig/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.h	2007-01-05 09:17:04.000000000 -0700
+++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/SQLite3Adaptor.h	2009-02-16 10:15:31.000000000 -0700
@@ -26,6 +26,10 @@
 
 #ifndef __SQLite3_Adaptor_H
 
+#ifndef GNUSTEP
+#include <GNUstepBase/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 extern NSString *SQLite3AdaptorExceptionName;
 
diff -u -r gnustep-dl2-0.11.0-orig/EOControl/EOAggregateEvent.m gnustep-dl2-0.11.0/EOControl/EOAggregateEvent.m
--- gnustep-dl2-0.11.0-orig/EOControl/EOAggregateEvent.m	2007-07-11 12:11:36.000000000 -0600
+++ gnustep-dl2-0.11.0/EOControl/EOAggregateEvent.m	2009-02-16 10:20:46.000000000 -0700
@@ -24,6 +24,9 @@
 */
 
 #include <Foundation/Foundation.h>
+#ifndef GNUSTEP
+#include <GNUstepBase/GNUstep.h>
+#endif
 
 #include "EOAggregateEvent.h"
 
diff -u -r gnustep-dl2-0.11.0-orig/Tools/Makefile.preamble gnustep-dl2-0.11.0/Tools/Makefile.preamble
--- gnustep-dl2-0.11.0-orig/Tools/Makefile.preamble	2006-09-14 15:11:01.000000000 -0600
+++ gnustep-dl2-0.11.0/Tools/Makefile.preamble	2009-02-16 10:18:29.000000000 -0700
@@ -58,6 +58,8 @@
 # Additional library directories the linker should search
 ADDITIONAL_LIB_DIRS += -L../EOAccess/$(GNUSTEP_OBJ_DIR) -L../EOControl/$(GNUSTEP_OBJ_DIR)
 
+ADDITIONAL_FRAMEWORK_DIRS += -F../EOAccess -F../EOControl
+
 
 #
 # Flags dealing with installing and uninstalling