diff --git a/ChangeLog b/ChangeLog
index 814217f52..9290d8568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-05-19  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSPortCoder.m:
+	* Source/NSMethodSignature.m:
+	* Source/GSFFCallInvocation.m:
+	* Source/GSFFIInvocation.m:
+	* Source/NSUnarchiver.m:
+	* Source/NSCoder.m:
+	* Source/cifframe.m:
+	* Source/Additions/GSObjCRuntime.m:
+	* Source/NSConnection.m:
+	* Source/NSData.m:
+	* Source/NSObjCRuntime.m:
+	* Source/NSArchiver.m:
+	Fixup objc header includes for gcc-4.6
+
 2011-05-12  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSFileHandle.m:
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index f92daee41..e992dac90 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -71,7 +71,6 @@ extern struct objc_slot	*objc_get_slot(Class, SEL);
 #define BDBGPrintf(format, args...) \
   do { if (behavior_debug) { fprintf(stderr, (format) , ## args); } } while (0)
 
-
 Class
 GSObjCClass(id obj)
 {
@@ -163,6 +162,11 @@ GSSelectorFromNameAndTypes(const char *name, const char *types)
 #elif defined (__GNUSTEP_RUNTIME__)
   return sel_registerTypedName_np(name, types);
 #else
+extern SEL sel_get_any_typed_uid(const char*);
+extern SEL sel_get_typed_uid(const char*, const char*);
+extern SEL sel_register_name(const char*);
+extern SEL sel_register_typed_name(const char*, const char*);
+
   if (name == 0)
     {
       return 0;
diff --git a/Source/GSFFCallInvocation.m b/Source/GSFFCallInvocation.m
index 6c55267a8..2986867cd 100644
--- a/Source/GSFFCallInvocation.m
+++ b/Source/GSFFCallInvocation.m
@@ -22,7 +22,6 @@
    Boston, MA 02111 USA.
    */
 #import "common.h"
-#import <objc/encoding.h>
 #import "Foundation/NSException.h"
 #import "Foundation/NSCoder.h"
 #import "Foundation/NSDistantObject.h"
@@ -31,6 +30,10 @@
 #import <callback.h>
 #import "callframe.h"
 
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #include <pthread.h>
 
 #import "GSInvocation.h"
diff --git a/Source/GSFFIInvocation.m b/Source/GSFFIInvocation.m
index 96a835d02..6c18a642e 100644
--- a/Source/GSFFIInvocation.m
+++ b/Source/GSFFIInvocation.m
@@ -23,7 +23,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #define	EXPOSE_NSInvocation_IVARS	1
 #import "Foundation/NSException.h"
 #import "Foundation/NSCoder.h"
diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m
index 5352b90a8..c2109f79a 100644
--- a/Source/NSArchiver.m
+++ b/Source/NSArchiver.m
@@ -26,7 +26,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #define	EXPOSE_NSArchiver_IVARS	1
 #define	EXPOSE_NSUnarchiver_IVARS	1
 /*
diff --git a/Source/NSCoder.m b/Source/NSCoder.m
index 14062b248..ea51424f7 100644
--- a/Source/NSCoder.m
+++ b/Source/NSCoder.m
@@ -27,7 +27,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #define	EXPOSE_NSCoder_IVARS	1
 #import "Foundation/NSData.h"
 #import "Foundation/NSCoder.h"
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 12a62ff2a..57499bf84 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -30,7 +30,10 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
 
 #define	GS_NSConnection_IVARS \
   BOOL			_isValid; \
diff --git a/Source/NSData.m b/Source/NSData.m
index 774a54a3a..368f255f6 100644
--- a/Source/NSData.m
+++ b/Source/NSData.m
@@ -68,7 +68,11 @@
  */
 
 #import "common.h"
-#import	<objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #import "GNUstepBase/GSObjCRuntime.h"
 #import "Foundation/NSByteOrder.h"
 #import "Foundation/NSCoder.h"
diff --git a/Source/NSMethodSignature.m b/Source/NSMethodSignature.m
index 628ceb80f..71d3946d1 100644
--- a/Source/NSMethodSignature.m
+++ b/Source/NSMethodSignature.m
@@ -28,9 +28,11 @@
    */
 
 #import "common.h"
-#ifndef __GNU_LIBOBJC__
-#include <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
 #endif
+
 #define	EXPOSE_NSMethodSignature_IVARS	1
 
 #import "Foundation/NSMethodSignature.h"
diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m
index 2226e58c6..4fec85e6c 100644
--- a/Source/NSObjCRuntime.m
+++ b/Source/NSObjCRuntime.m
@@ -26,7 +26,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #import "Foundation/NSException.h"
 #include <string.h>
 
diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m
index aa1146f64..cfb563fba 100644
--- a/Source/NSPortCoder.m
+++ b/Source/NSPortCoder.m
@@ -34,7 +34,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #define	EXPOSE_NSPortCoder_IVARS	1
 #import "Foundation/NSException.h"
 #import "Foundation/NSByteOrder.h"
diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m
index e1ee5d121..8d213c077 100644
--- a/Source/NSUnarchiver.m
+++ b/Source/NSUnarchiver.m
@@ -26,7 +26,11 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
+
 #define	EXPOSE_NSUnarchiver_IVARS	1
 #include <string.h>
 #import "Foundation/NSDictionary.h"
diff --git a/Source/cifframe.m b/Source/cifframe.m
index bd52f3cfa..3ea9575e8 100644
--- a/Source/cifframe.m
+++ b/Source/cifframe.m
@@ -24,7 +24,10 @@
    */
 
 #import "common.h"
-#import <objc/encoding.h>
+
+#if !defined (__GNU_LIBOBJC__)
+#  include <objc/encoding.h>
+#endif
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>