diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a4805c3c75e..72e9756a892 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Loren James Rittle  <ljrittle@acm.org>
+
+	* config/i386/i386.h (ix86_return_in_memory): Revert my last patch.
+	* objc/objc-act.c (tm_p.h): Include.
+
 2003-09-26  Per Bothner  <pbothner@apple.com>
 
 	* dbxout.c (dbxout_typedefs):  Output typedefs in forward order.
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index c3d45070f4a..5ad5a141ddf 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1245,7 +1245,6 @@ do {									\
    should always be returned in memory.  You should instead use
    `DEFAULT_PCC_STRUCT_RETURN' to indicate this.  */
 
-int ix86_return_in_memory (tree type);
 #define RETURN_IN_MEMORY(TYPE) \
   ix86_return_in_memory (TYPE)
 
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index af294a930c5..4653f329f27 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -43,6 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
+#include "tm_p.h"
 #include "tree.h"
 #include "rtl.h"
 #include "expr.h"