diff --git a/Headers/Additions/GNUstepBase/GSObjCRuntime.h b/Headers/Additions/GNUstepBase/GSObjCRuntime.h
index b8056c0ca..bd379edf8 100644
--- a/Headers/Additions/GNUstepBase/GSObjCRuntime.h
+++ b/Headers/Additions/GNUstepBase/GSObjCRuntime.h
@@ -43,7 +43,7 @@
 #else
 /* We emulate an ObjC2 runtime.
  */
-#include <GNUstepBase/runtime.h>
+#include <ObjectiveC2/runtime.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 6fef70192..9b0cc36a2 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -142,12 +142,6 @@ behavior.h \
 preface.h \
 Additions.h
 
-# If we are using ObjC2 compatibility, we need to include the runtime.h
-# header with all the additional headers.
-ifeq ($(OBJC2RUNTIME),0)
-ADD_HEADERS += runtime.h
-endif
-
 GNU_HEADERS = $(ADD_HEADERS)
 
 # GNUStep source files
@@ -444,7 +438,6 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
 GENERATED_HFILES = \
 dynamic-load.h \
 $(HEADER_DIR_BASE)/preface.h \
-$(HEADER_DIR_BASE)/runtime.h \
 $(GNUSTEP_TARGET_DIR)/config.h \
 $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
 
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index a6744a65e..25060c3af 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -95,7 +95,6 @@ before-uninstall::
 # Things to do after cleaning
 after-clean::
 	rm -f libgnustep-base.def
-	rm -f ../Headers/Additions/GNUstep/runtime.h
 	rm -f ../Headers/Foundation/Foundation.h.saved
 
 # Things to do before distcleaning
@@ -142,9 +141,6 @@ $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
 	-mv mframe/mframe.h $(GNUSTEP_TARGET_DIR)
 	-touch $(GNUSTEP_TARGET_DIR)/mframe.h
 
-$(HEADER_DIR_BASE)/runtime.h: ObjectiveC2/runtime.h
-	cp ObjectiveC2/runtime.h $(HEADER_DIR_BASE)
-
 #
 #       Files where optimisation breaks the code!
 #       These have to filter the optimisation flag out.
diff --git a/Source/ObjectiveC2/blocks_runtime.h b/Source/ObjectiveC2/blocks_runtime.h
index 2def0a495..20cf9cc86 100644
--- a/Source/ObjectiveC2/blocks_runtime.h
+++ b/Source/ObjectiveC2/blocks_runtime.h
@@ -2,7 +2,7 @@
  * Blocks Runtime
  */
 
-#include "Availability.h"
+#include "ObjectiveC2/Availability.h"
 #ifdef __cplusplus
 #define BLOCKS_EXPORT extern "C"
 #else
diff --git a/Source/ObjectiveC2/blocks_runtime.m b/Source/ObjectiveC2/blocks_runtime.m
index 25e0151da..d1a22bcc2 100644
--- a/Source/ObjectiveC2/blocks_runtime.m
+++ b/Source/ObjectiveC2/blocks_runtime.m
@@ -23,8 +23,8 @@
  *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *  OTHER DEALINGS IN THE SOFTWARE.
  */
-#import "blocks_runtime.h"
-#import "runtime.h"
+#import "ObjectiveC2/blocks_runtime.h"
+#import "ObjectiveC2/runtime.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/Source/ObjectiveC2/runtime.c b/Source/ObjectiveC2/runtime.c
index 869488fc1..7bf9972f1 100644
--- a/Source/ObjectiveC2/runtime.c
+++ b/Source/ObjectiveC2/runtime.c
@@ -1,4 +1,4 @@
-#include "runtime.h"
+#include "ObjectiveC2/runtime.h"
 
 /* Make glibc export strdup() */
 
@@ -916,7 +916,7 @@ objc_allocateMetaClass(Class superclass, size_t extraBytes)
   // Initialize the metaclass
   metaClass->class_pointer = superclass->class_pointer->class_pointer;
   metaClass->super_class = superclass->class_pointer;
-  metaClass->name = "hidden class";
+  metaClass->name = "hidden class"; //strdup(superclass->name);
   metaClass->info = _CLS_RESOLV | _CLS_INITIALIZED | _CLS_META;
   metaClass->dtable = __objc_uninstalled_dtable;
   metaClass->instance_size = sizeof(struct objc_class);
diff --git a/Source/ObjectiveC2/runtime.h b/Source/ObjectiveC2/runtime.h
index b106708b5..c557c4257 100644
--- a/Source/ObjectiveC2/runtime.h
+++ b/Source/ObjectiveC2/runtime.h
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include "Availability.h"
+#include "ObjectiveC2/Availability.h"
 
 #if   defined(ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS)
 #  define OBJC_GNU_RUNTIME_UNSUPPORTED(x) \
diff --git a/Source/ObjectiveC2/sync.m b/Source/ObjectiveC2/sync.m
index 17b4fc366..cf04ec041 100644
--- a/Source/ObjectiveC2/sync.m
+++ b/Source/ObjectiveC2/sync.m
@@ -1,4 +1,4 @@
-#include "runtime.h"
+#include "ObjectiveC2/runtime.h"
 
 /* Ensure Unix98 compatible pthreads for glibc */
 #if defined __GLIBC__