From 3e08b99be1b7670394516dde9be59c5cdb356f2b Mon Sep 17 00:00:00 2001
From: Mirko Viviani <mirko.viviani@gmail.com>
Date: Mon, 30 Dec 2002 23:00:10 +0000
Subject: [PATCH] Added missing debug includes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15410 72102866-910b-0410-8b05-ffd578937521
---
 EOAccess/EOAccessFault.m             | 2 ++
 EOAccess/EOAdaptor.m                 | 1 +
 EOAccess/EOAdaptorChannel.m          | 1 +
 EOAccess/EOAdaptorContext.m          | 4 ++++
 EOAccess/EOAdaptorOperation.m        | 2 ++
 EOAccess/EOAttribute.m               | 2 ++
 EOAccess/EODatabase.m                | 3 +++
 EOAccess/EODatabaseChannel.m         | 1 +
 EOAccess/EODatabaseContext.m         | 2 ++
 EOAccess/EODatabaseDataSource.m      | 2 ++
 EOAccess/EODatabaseOperation.m       | 3 +++
 EOAccess/EOExpressionArray.m         | 4 ++++
 EOAccess/EOJoin.m                    | 3 +++
 EOAccess/EOModel.m                   | 1 +
 EOAccess/EOModelGroup.m              | 1 +
 EOAccess/EORelationship.m            | 2 +-
 EOAccess/EOSQLExpression.m           | 1 +
 EOAccess/EOSQLQualifier.m            | 1 +
 EOAccess/EOStoredProcedure.m         | 1 +
 EOControl/EOAndQualifier.m           | 1 +
 EOControl/EODataSource.m             | 1 +
 EOControl/EODetailDataSource.m       | 2 ++
 EOControl/EOEditingContext.m         | 1 +
 EOControl/EOFault.m                  | 2 ++
 EOControl/EOFaultHandler.m           | 4 +++-
 EOControl/EOFetchSpecification.m     | 1 +
 EOControl/EOGenericRecord.m          | 2 ++
 EOControl/EOGlobalID.m               | 1 +
 EOControl/EOKeyComparisonQualifier.m | 1 +
 EOControl/EOKeyGlobalID.m            | 1 +
 EOControl/EOKeyValueArchiver.m       | 1 +
 EOControl/EONSAddOns.m               | 1 +
 EOControl/EONull.m                   | 3 +++
 EOControl/EOObjectStoreCoordinator.m | 1 +
 EOControl/EOObserver.m               | 2 ++
 EOControl/EOOrQualifier.m            | 2 ++
 EOControl/EOQualifier.m              | 1 +
 EOControl/EOSortOrdering.m           | 2 ++
 EOControl/EOUndoManager.m            | 1 +
 39 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/EOAccess/EOAccessFault.m b/EOAccess/EOAccessFault.m
index 3f7c448..7cf7e39 100644
--- a/EOAccess/EOAccessFault.m
+++ b/EOAccess/EOAccessFault.m
@@ -38,12 +38,14 @@ static char rcsId[] = "$Id$";
 #endif
 
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOAccessFault.h>
 #import <EOAccess/EOAccessFaultPriv.h>
 #import <EOAccess/EODatabaseContext.h>
 
 #import <EOControl/EOCheapArray.h>
+#import <EOControl/EODebug.h>
 
 
 NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAvailableException";
diff --git a/EOAccess/EOAdaptor.m b/EOAccess/EOAdaptor.m
index eb50ec9..fa6154c 100644
--- a/EOAccess/EOAdaptor.m
+++ b/EOAccess/EOAdaptor.m
@@ -54,6 +54,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSFileManager.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOAdaptor.h>
 #import <EOAccess/EOAdaptorPriv.h>
diff --git a/EOAccess/EOAdaptorChannel.m b/EOAccess/EOAdaptorChannel.m
index e80412a..84aca41 100644
--- a/EOAccess/EOAdaptorChannel.m
+++ b/EOAccess/EOAdaptorChannel.m
@@ -46,6 +46,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EOMutableKnownKeyDictionary.h>
 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EONSAddOns.h>
+#import <EOControl/EODebug.h>
 
 
 NSString *EOAdaptorOperationsKey = @"EOAdaptorOperationsKey";
diff --git a/EOAccess/EOAdaptorContext.m b/EOAccess/EOAdaptorContext.m
index c369607..45b05e8 100644
--- a/EOAccess/EOAdaptorContext.m
+++ b/EOAccess/EOAdaptorContext.m
@@ -38,12 +38,16 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSUtilities.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOAdaptor.h>
 #import <EOAccess/EOAdaptorPriv.h>
 #import <EOAccess/EOAdaptorContext.h>
 #import <EOAccess/EOAdaptorChannel.h>
 
+#import <EOControl/EODebug.h>
+
+
 NSString *EOAdaptorContextBeginTransactionNotification = @"EOAdaptorContextBeginTransactionNotofication";
 NSString *EOAdaptorContextCommitTransactionNotification = @"EOAdaptorContextCommitTransactionNotofication";
 NSString *EOAdaptorContextRollbackTransactionNotification = @"EOAdaptorContextRollbackTransactionNotofication";
diff --git a/EOAccess/EOAdaptorOperation.m b/EOAccess/EOAdaptorOperation.m
index 33fba76..0eb3930 100644
--- a/EOAccess/EOAdaptorOperation.m
+++ b/EOAccess/EOAdaptorOperation.m
@@ -35,12 +35,14 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSObject.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EODatabaseOperation.h>
 #import <EOAccess/EOAttribute.h>
 #import <EOAccess/EOEntity.h>
 
 #import <EOControl/EOSortOrdering.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EOAdaptorOperation
diff --git a/EOAccess/EOAttribute.m b/EOAccess/EOAttribute.m
index a026c78..959d496 100644
--- a/EOAccess/EOAttribute.m
+++ b/EOAccess/EOAttribute.m
@@ -48,6 +48,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSDecimalNumber.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOModel.h>
 #import <EOAccess/EOEntity.h>
@@ -60,6 +61,7 @@ static char rcsId[] = "$Id$";
 
 #import <EOControl/EONull.h>
 #import <EOControl/EOObserver.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EOAttribute
diff --git a/EOAccess/EODatabase.m b/EOAccess/EODatabase.m
index 42c96f0..323a36f 100644
--- a/EOAccess/EODatabase.m
+++ b/EOAccess/EODatabase.m
@@ -41,6 +41,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSUtilities.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSSet.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOAccessFault.h>
 #import <EOAccess/EOAdaptor.h>
@@ -51,6 +52,8 @@ static char rcsId[] = "$Id$";
 
 #import <EOControl/EOObjectStore.h>
 #import <EOControl/EOKeyGlobalID.h>
+#import <EOControl/EODebug.h>
+
 
 /* TODO
 
diff --git a/EOAccess/EODatabaseChannel.m b/EOAccess/EODatabaseChannel.m
index c3708bb..5df861d 100644
--- a/EOAccess/EODatabaseChannel.m
+++ b/EOAccess/EODatabaseChannel.m
@@ -61,6 +61,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EOClassDescription.h>
 #import <EOControl/EOGlobalID.h>
 #import <EOControl/EOObjectStore.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EODatabaseChannel
diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m
index 33d4d97..d830e5f 100644
--- a/EOAccess/EODatabaseContext.m
+++ b/EOAccess/EODatabaseContext.m
@@ -46,6 +46,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSSet.h>
 #import <Foundation/NSData.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOAdaptor.h>
 #import <EOAccess/EOAdaptorChannel.h>
@@ -80,6 +81,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EOCheapArray.h>
 #import <EOControl/EONSAddOns.h>
 #import <EOControl/EONull.h>
+#import <EOControl/EODebug.h>
 
 
 #define _LOCK_BUFFER 128
diff --git a/EOAccess/EODatabaseDataSource.m b/EOAccess/EODatabaseDataSource.m
index 7d9c4b2..ba8e966 100644
--- a/EOAccess/EODatabaseDataSource.m
+++ b/EOAccess/EODatabaseDataSource.m
@@ -42,6 +42,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSString.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EODatabaseDataSource.h>
 #import <EOAccess/EOEntity.h>
@@ -56,6 +57,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EOKeyValueArchiver.h>
 #import <EOControl/EODataSource.h>
 #import <EOControl/EODetailDataSource.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EODatabaseDataSource
diff --git a/EOAccess/EODatabaseOperation.m b/EOAccess/EODatabaseOperation.m
index 1ef7815..ba122cd 100644
--- a/EOAccess/EODatabaseOperation.m
+++ b/EOAccess/EODatabaseOperation.m
@@ -34,11 +34,14 @@
 static char rcsId[] = "$Id$";
 
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EODatabaseOperation.h>
 #import <EOAccess/EOAttribute.h>
 #import <EOAccess/EOEntity.h>
 
+#import <EOControl/EODebug.h>
+
 
 @implementation EODatabaseOperation
 
diff --git a/EOAccess/EOExpressionArray.m b/EOAccess/EOExpressionArray.m
index 151fd68..22f1365 100644
--- a/EOAccess/EOExpressionArray.m
+++ b/EOAccess/EOExpressionArray.m
@@ -43,6 +43,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSValue.h>
 #import <Foundation/NSDate.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <gnustep/base/GSObjCRuntime.h>
 
@@ -50,6 +51,9 @@ static char rcsId[] = "$Id$";
 #import <EOAccess/EOExpressionArray.h>
 #import <EOAccess/EORelationship.h>
 
+#import <EOControl/EODebug.h>
+
+
 
 @implementation EOExpressionArray
 
diff --git a/EOAccess/EOJoin.m b/EOAccess/EOJoin.m
index bf273cb..eeacbb3 100644
--- a/EOAccess/EOJoin.m
+++ b/EOAccess/EOJoin.m
@@ -35,6 +35,7 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSString.h>
 #import <Foundation/NSUtilities.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOModel.h>
 #import <EOAccess/EOEntity.h>
@@ -42,6 +43,8 @@ static char rcsId[] = "$Id$";
 #import <EOAccess/EORelationship.h>
 #import <EOAccess/EOJoin.h>
 
+#import <EOControl/EODebug.h>
+
 
 @implementation EOJoin
 
diff --git a/EOAccess/EOModel.m b/EOAccess/EOModel.m
index 5d41b55..4396553 100644
--- a/EOAccess/EOModel.m
+++ b/EOAccess/EOModel.m
@@ -42,6 +42,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSNotification.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOModel.h>
 #import <EOAccess/EOEntity.h>
diff --git a/EOAccess/EOModelGroup.m b/EOAccess/EOModelGroup.m
index d614886..d51bdda 100644
--- a/EOAccess/EOModelGroup.m
+++ b/EOAccess/EOModelGroup.m
@@ -35,6 +35,7 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSNotification.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOModelGroup.h>
 #import <EOAccess/EOModel.h>
diff --git a/EOAccess/EORelationship.m b/EOAccess/EORelationship.m
index 09d7731..87d3faa 100644
--- a/EOAccess/EORelationship.m
+++ b/EOAccess/EORelationship.m
@@ -38,8 +38,8 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSUtilities.h>
-
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOModel.h>
 #import <EOAccess/EOAttribute.h>
diff --git a/EOAccess/EOSQLExpression.m b/EOAccess/EOSQLExpression.m
index 727fa06..447aecc 100644
--- a/EOAccess/EOSQLExpression.m
+++ b/EOAccess/EOSQLExpression.m
@@ -43,6 +43,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSUtilities.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOEntity.h>
 #import <EOAccess/EOAttribute.h>
diff --git a/EOAccess/EOSQLQualifier.m b/EOAccess/EOSQLQualifier.m
index a36c79a..c240ab0 100644
--- a/EOAccess/EOSQLQualifier.m
+++ b/EOAccess/EOSQLQualifier.m
@@ -40,6 +40,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSSet.h>
 #import <Foundation/NSUtilities.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOAccess/EOSQLQualifier.h>
 #import <EOAccess/EOAttribute.h>
diff --git a/EOAccess/EOStoredProcedure.m b/EOAccess/EOStoredProcedure.m
index d0bd49b..c548e46 100644
--- a/EOAccess/EOStoredProcedure.m
+++ b/EOAccess/EOStoredProcedure.m
@@ -34,6 +34,7 @@
 static char rcsId[] = "$Id$";
 
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #import <gnustep/base/GCObject.h>
 
diff --git a/EOControl/EOAndQualifier.m b/EOControl/EOAndQualifier.m
index 54d0f38..3e8490b 100644
--- a/EOControl/EOAndQualifier.m
+++ b/EOControl/EOAndQualifier.m
@@ -39,6 +39,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSSet.h>
 #import <Foundation/NSUtilities.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOQualifier.h>
 #import <EOControl/EODebug.h>
diff --git a/EOControl/EODataSource.m b/EOControl/EODataSource.m
index 08fe7a1..48bf8ef 100644
--- a/EOControl/EODataSource.m
+++ b/EOControl/EODataSource.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EODataSource.h>
 #import <EOControl/EOClassDescription.h>
 #import <EOControl/EOEditingContext.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EODataSource
diff --git a/EOControl/EODetailDataSource.m b/EOControl/EODetailDataSource.m
index f71540e..c814910 100644
--- a/EOControl/EODetailDataSource.m
+++ b/EOControl/EODetailDataSource.m
@@ -37,11 +37,13 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSString.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EODetailDataSource.h>
 #import <EOControl/EOKeyValueCoding.h>
 #import <EOControl/EOKeyValueArchiver.h>
 #import <EOControl/EOClassDescription.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EODetailDataSource
diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m
index c1651d8..66ccf5b 100644
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@@ -44,6 +44,7 @@ static char rcsId[] = "$Id$";
 #import <EOControl/EONull.h>
 #import <EOControl/EOUndoManager.h>
 #import <EOControl/EONSAddOns.h>
+#import <EOControl/EODebug.h>
 
 #import <EOAccess/EOEntity.h>
 
diff --git a/EOControl/EOFault.m b/EOControl/EOFault.m
index 36f0f4f..7952f23 100644
--- a/EOControl/EOFault.m
+++ b/EOControl/EOFault.m
@@ -49,11 +49,13 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSInvocation.h>
 #import <Foundation/NSLock.h>
 #import <Foundation/NSException.h>
+#import <Foundation/NSDebug.h>
 
 #include <objc/objc-api.h>
 
 #import <EOControl/EOFault.h>
 #import <EOControl/EOKeyGlobalID.h>
+#import <EOControl/EODebug.h>
 
 #import <EOAccess/EODatabaseContext.h>
 
diff --git a/EOControl/EOFaultHandler.m b/EOControl/EOFaultHandler.m
index 4f3dcac..111280d 100644
--- a/EOControl/EOFaultHandler.m
+++ b/EOControl/EOFaultHandler.m
@@ -39,11 +39,13 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSObjCRuntime.h>
-
+#import <Foundation/NSDebug.h>
 #import <Foundation/NSException.h>
+
 #import <gnustep/base/GCObject.h>
 
 #import <EOControl/EOFault.h>
+#import <EOControl/EODebug.h>
 
 
 BOOL __isGCEnabled(Class class_)
diff --git a/EOControl/EOFetchSpecification.m b/EOControl/EOFetchSpecification.m
index 082fa26..9a0251f 100644
--- a/EOControl/EOFetchSpecification.m
+++ b/EOControl/EOFetchSpecification.m
@@ -35,6 +35,7 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSCoder.h>
 #import <Foundation/NSValue.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EOKeyValueArchiver.h>
diff --git a/EOControl/EOGenericRecord.m b/EOControl/EOGenericRecord.m
index ce7dc9f..4ece1a3 100644
--- a/EOControl/EOGenericRecord.m
+++ b/EOControl/EOGenericRecord.m
@@ -42,6 +42,8 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSLock.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSHashTable.h>
+#import <Foundation/NSDebug.h>
+
 #import <gnustep/base/GSObjCRuntime.h>
 
 #import <EOAccess/EOEntity.h>
diff --git a/EOControl/EOGlobalID.m b/EOControl/EOGlobalID.m
index ea17e17..2128aba 100644
--- a/EOControl/EOGlobalID.m
+++ b/EOControl/EOGlobalID.m
@@ -37,6 +37,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSString.h>
 
 #import <EOControl/EOGlobalID.h>
+#import <EOControl/EODebug.h>
 
 #include <time.h>
 #include <unistd.h>
diff --git a/EOControl/EOKeyComparisonQualifier.m b/EOControl/EOKeyComparisonQualifier.m
index 8e30505..036567e 100644
--- a/EOControl/EOKeyComparisonQualifier.m
+++ b/EOControl/EOKeyComparisonQualifier.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSSet.h>
 #import <Foundation/NSUtilities.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOQualifier.h>
 #import <EOControl/EOKeyValueCoding.h>
diff --git a/EOControl/EOKeyGlobalID.m b/EOControl/EOKeyGlobalID.m
index 3b6f3fe..f822c99 100644
--- a/EOControl/EOKeyGlobalID.m
+++ b/EOControl/EOKeyGlobalID.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSString.h>
 #import <Foundation/NSCoder.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOKeyGlobalID.h>
 #import <EOControl/EODebug.h>
diff --git a/EOControl/EOKeyValueArchiver.m b/EOControl/EOKeyValueArchiver.m
index 56d57c7..e79ebf5 100644
--- a/EOControl/EOKeyValueArchiver.m
+++ b/EOControl/EOKeyValueArchiver.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/Foundation.h>
 
 #import <EOControl/EOKeyValueArchiver.h>
+#import <EOControl/EODebug.h>
 
 
 @interface EOKeyValueArchivingContainer : NSObject
diff --git a/EOControl/EONSAddOns.m b/EOControl/EONSAddOns.m
index 45c8d49..779c644 100644
--- a/EOControl/EONSAddOns.m
+++ b/EOControl/EONSAddOns.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/Foundation.h>
 
 #import <EOControl/EONSAddOns.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation NSObject (NSObjectPerformingSelector)
diff --git a/EOControl/EONull.m b/EOControl/EONull.m
index ab8753a..41bc1d3 100644
--- a/EOControl/EONull.m
+++ b/EOControl/EONull.m
@@ -38,7 +38,10 @@ static char rcsId[] = "$Id$";
 
 #import <Foundation/NSNull.h>
 #import <Foundation/NSString.h> 
+#import <Foundation/NSDebug.h> 
+
 #import <EOControl/EONull.h>
+#import <EOControl/EODebug.h>
 
 #include "config.h"
 
diff --git a/EOControl/EOObjectStoreCoordinator.m b/EOControl/EOObjectStoreCoordinator.m
index 78c7ea8..211e488 100644
--- a/EOControl/EOObjectStoreCoordinator.m
+++ b/EOControl/EOObjectStoreCoordinator.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 
 #import <EOControl/EOObjectStoreCoordinator.h>
 #import <EOControl/EOEditingContext.h>
+#import <EOControl/EODebug.h>
 
 #import <EOAccess/EODatabaseContext.h>
 #import <EOAccess/EOModelGroup.h>
diff --git a/EOControl/EOObserver.m b/EOControl/EOObserver.m
index 0c73412..67e4a8c 100644
--- a/EOControl/EOObserver.m
+++ b/EOControl/EOObserver.m
@@ -36,11 +36,13 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSObject.h>
 #import <Foundation/NSMapTable.h>
 #import <Foundation/NSNotification.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOClassDescription.h>
 #import <EOControl/EOKeyValueCoding.h>
 #import <EOControl/EONull.h>
 #import <EOControl/EOObserver.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation NSObject (EOObserver)
diff --git a/EOControl/EOOrQualifier.m b/EOControl/EOOrQualifier.m
index 6c9f365..9811a1c 100644
--- a/EOControl/EOOrQualifier.m
+++ b/EOControl/EOOrQualifier.m
@@ -37,8 +37,10 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSSet.h>
 #import <Foundation/NSUtilities.h>
 #import <Foundation/NSString.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOQualifier.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EOOrQualifier
diff --git a/EOControl/EOQualifier.m b/EOControl/EOQualifier.m
index 515e2f6..85ca94d 100644
--- a/EOControl/EOQualifier.m
+++ b/EOControl/EOQualifier.m
@@ -42,6 +42,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/NSException.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOQualifier.h>
 #import <EOControl/EODebug.h>
diff --git a/EOControl/EOSortOrdering.m b/EOControl/EOSortOrdering.m
index 36556cc..41df3f6 100644
--- a/EOControl/EOSortOrdering.m
+++ b/EOControl/EOSortOrdering.m
@@ -34,10 +34,12 @@
 static char rcsId[] = "$Id$";
 
 #import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
 
 #import <EOControl/EOSortOrdering.h>
 #import <EOControl/EOKeyValueCoding.h>
 #import <EOControl/EOKeyValueArchiver.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EOSortOrdering
diff --git a/EOControl/EOUndoManager.m b/EOControl/EOUndoManager.m
index ae4c745..6b6fb17 100644
--- a/EOControl/EOUndoManager.m
+++ b/EOControl/EOUndoManager.m
@@ -36,6 +36,7 @@ static char rcsId[] = "$Id$";
 #import <Foundation/Foundation.h>
 
 #import <EOControl/EOUndoManager.h>
+#import <EOControl/EODebug.h>
 
 
 @implementation EOUndoManager