diff --git a/Headers/Foundation/NSOrderedSet.h b/Headers/Foundation/NSOrderedSet.h
index d97c25af3..54695e2bb 100644
--- a/Headers/Foundation/NSOrderedSet.h
+++ b/Headers/Foundation/NSOrderedSet.h
@@ -202,4 +202,8 @@ extern "C" {
 - (instancetype) initWithCoder: (NSCoder *)coder;
 @end
 
+#if	defined(__cplusplus)
+}
 #endif
+
+#endif /* _NSOrderedSet_h_GNUSTEP_BASE_INCLUDE */
diff --git a/Source/NSOrderedSet.m b/Source/NSOrderedSet.m
index 4e3b170db..c287f0957 100644
--- a/Source/NSOrderedSet.m
+++ b/Source/NSOrderedSet.m
@@ -1144,7 +1144,8 @@ static SEL	rlSel;
 
 - (BOOL) intersectsSet: (NSSet *)otherSet
 {
-  id	o = nil, e = nil;
+  id	o = nil;
+  NSEnumerator *e = nil;
 
   // -1. If this set is empty, this method should return NO.
   if ([self count] == 0)