diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h
index 04d4872e8..ff120c2f7 100644
--- a/SoObjects/SOGo/NSString+Utilities.h
+++ b/SoObjects/SOGo/NSString+Utilities.h
@@ -38,7 +38,7 @@
 
 - (NSString *) davMethodToObjC;
 
-#ifndef GNUSTEP
+#ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue;
 #endif
 
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index f96f60fb5..675364843 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -100,7 +100,7 @@
   return newName;
 }
 
-#ifndef GNUSTEP
+#ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue
 {
   return !([self isEqualToString: @"0"]
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 4de6fb70d..7ddb35d58 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -24,6 +24,7 @@
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSURL.h>