diff --git a/gcc/objc/thr-decosf1.c b/gcc/objc/thr-decosf1.c
index 1f1d6f396b56..684f0b848b6d 100644
--- a/gcc/objc/thr-decosf1.c
+++ b/gcc/objc/thr-decosf1.c
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <pthread.h>
+#include <objc/thr.h>
+#include "runtime.h"
 
 /********
  *  This structure represents a single mutual exclusion lock.  Lock semantics
diff --git a/gcc/objc/thr-irix.c b/gcc/objc/thr-irix.c
index 7e1236a55308..ca9fca0f374a 100644
--- a/gcc/objc/thr-irix.c
+++ b/gcc/objc/thr-irix.c
@@ -29,6 +29,8 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/sysmp.h>
 #include <sys/prctl.h>
 #include <ulocks.h>
+#include <objc/thr.h>
+#include "runtime.h"
 
 /********
  *  This structure represents a single mutual exclusion lock.  Lock semantics
diff --git a/gcc/objc/thr-mach.c b/gcc/objc/thr-mach.c
index 22743d2cb56b..10aedbaeda07 100644
--- a/gcc/objc/thr-mach.c
+++ b/gcc/objc/thr-mach.c
@@ -1,8 +1,7 @@
 /* GNU Objective C Runtime Thread Implementation
    Copyright (C) 1996 Free Software Foundation, Inc.
-
-Author: Galen C. Hunt (gchunt@cs.rochester.edu)
-Modified for Mach threads by: Bill Bumgarner <bbum@friday.com>
+   Contributed by Galen C. Hunt (gchunt@cs.rochester.edu)
+   Modified for Mach threads by Bill Bumgarner <bbum@friday.com>
 
 This file is part of GNU CC.
 
@@ -28,6 +27,8 @@ Boston, MA 02111-1307, USA.  */
 
 #include <mach/mach.h>
 #include <mach/cthreads.h>
+#include <objc/thr.h>
+#include "runtime.h"
 
 /********
  *  This structure represents a single mutual exclusion lock.  Lock semantics
diff --git a/gcc/objc/thr-os2.c b/gcc/objc/thr-os2.c
index 0db006b8bc7d..470ab871719b 100644
--- a/gcc/objc/thr-os2.c
+++ b/gcc/objc/thr-os2.c
@@ -1,9 +1,6 @@
 /* GNU Objective C Runtime Thread Interface - OS/2 emx Implementation
    Copyright (C) 1996 Free Software Foundation, Inc.
-
-Author: Thomas Baier (baier@ci.tuwien.ac.at)
-
-This file is included into thread.c
+   Contributed by Thomas Baier (baier@ci.tuwien.ac.at)
 
 This file is part of GNU CC.
 
@@ -27,6 +24,9 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#include <objc/thr.h>
+#include "runtime.h"
+
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSPROCESS
 
diff --git a/gcc/objc/thr-posix.c b/gcc/objc/thr-posix.c
index fd9be1bfc12a..e2a98d23586e 100644
--- a/gcc/objc/thr-posix.c
+++ b/gcc/objc/thr-posix.c
@@ -1,8 +1,7 @@
 /* GNU Objective C Runtime Thread Interface for POSIX compliant threads
    Copyright (C) 1996 Free Software Foundation, Inc.
-
-Author: Galen C. Hunt (gchunt@cs.rochester.edu)
-Modified for Linux & Pthreads: Kai-Uwe Sattler (kus@iti.cs.uni-magdeburg.de)
+   Contributed by Galen C. Hunt (gchunt@cs.rochester.edu)
+   Modified for Linux/Pthreads by Kai-Uwe Sattler (kus@iti.cs.uni-magdeburg.de)
 
 This file is part of GNU CC.
 
@@ -26,6 +25,8 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#include <objc/thr.h>
+#include "runtime.h"
 #include <pthread.h>
 
 /********
diff --git a/gcc/objc/thr-single.c b/gcc/objc/thr-single.c
index 543f6dbeb511..5ab416db9a0b 100644
--- a/gcc/objc/thr-single.c
+++ b/gcc/objc/thr-single.c
@@ -24,6 +24,9 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#include <objc/thr.h>
+#include "runtime.h"
+
 /********
  *  This structure represents a single mutual exclusion lock.  Lock semantics
  *  are detailed with the subsequent functions.  We use whatever lock is
diff --git a/gcc/objc/thr-solaris.c b/gcc/objc/thr-solaris.c
index d27fcb428e9e..75fad21551f7 100644
--- a/gcc/objc/thr-solaris.c
+++ b/gcc/objc/thr-solaris.c
@@ -1,6 +1,6 @@
 /* GNU Objective C Runtime Thread Interface
    Copyright (C) 1996 Free Software Foundation, Inc.
-   Cobnrtibuted by Galen C. Hunt (gchunt@cs.rochester.edu)
+   Contributed by Galen C. Hunt (gchunt@cs.rochester.edu)
 
 This file is part of GNU CC.
 
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#include <objc/thr.h>
 #include "runtime.h"
 
 #include <thread.h>
diff --git a/gcc/objc/thr-win32.c b/gcc/objc/thr-win32.c
index d933999ccb76..f31ed630a771 100644
--- a/gcc/objc/thr-win32.c
+++ b/gcc/objc/thr-win32.c
@@ -25,6 +25,8 @@ Boston, MA 02111-1307, USA.  */
    covered by the GNU General Public License.  */
 
 #include <windows.h>
+#include <objc/thr.h>
+#include "runtime.h"
 
 /********
  *  This structure represents a single mutual exclusion lock.  Lock semantics