diff --git a/GSWeb.framework/GSWBundle.m b/GSWeb.framework/GSWBundle.m
index 1a720d9..54b96aa 100644
--- a/GSWeb.framework/GSWBundle.m
+++ b/GSWeb.framework/GSWBundle.m
@@ -36,7 +36,7 @@ RCS_ID("$Id$")
 
 #include "GSWeb.h"
 
-#ifdef GDL2
+#ifdef HAVE_GDL2
 #include <EOControl/EOKeyValueCoding.h>
 
 //====================================================================
@@ -76,7 +76,7 @@ objectForReference:(NSString*)keyPath
 };
 
 @end
-#endif // GDL2
+#endif // HAVE_GDL2
 //====================================================================
 @implementation GSWBundle
 
@@ -387,7 +387,7 @@ objectForReference:(NSString*)keyPath
           if (defaultAssociations && [anObject respondsToSelector:@selector(setDefaultAssociations:)])
             [anObject setDefaultAssociations:defaultAssociations];
         };
-#if GDL2 // GDL2 implementation
+#if HAVE_GDL2 // GDL2 implementation
       {
         EOKeyValueUnarchiver* unarchiver=nil;
         GSWBundleUnarchiverDelegate* bundleDelegate=nil;
diff --git a/GSWeb.framework/NSObject+IVarAccess+PerformSel.m b/GSWeb.framework/NSObject+IVarAccess+PerformSel.m
index e68f3b8..1eecf8e 100644
--- a/GSWeb.framework/NSObject+IVarAccess+PerformSel.m
+++ b/GSWeb.framework/NSObject+IVarAccess+PerformSel.m
@@ -173,7 +173,7 @@ const char* GSGetInstanceVariableType(id obj,
   return selector;
 };
 
-#if GDL2
+#if HAVE_GDL2
 
 //--------------------------------------------------------------------
 
diff --git a/GSWeb.framework/NSString+Trimming.m b/GSWeb.framework/NSString+Trimming.m
index ca71252..1399d6f 100644
--- a/GSWeb.framework/NSString+Trimming.m
+++ b/GSWeb.framework/NSString+Trimming.m
@@ -212,7 +212,7 @@ RCS_ID("$Id$")
     {
       if ([object isKindOfClass:[NSString class]])
         string=[[object copy] autorelease];
-#ifdef GDL2
+#ifdef HAVE_GDL2
       else if ([object isKindOfClass:[EONull class]])
         string=@"";
 #else