diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e7b8dc3a88..a629660a547 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31  Doug Evans  <xdje42@gmail.com>
+
+	* objfiles.h (ALL_PSPACE_OBJFILES_SAFE): Delete, unused.
+	(ALL_PSPACE_SYMTABS, ALL_PSPACE_PRIMARY_SYMTABS): Ditto.
+
 2014-10-31  Doug Evans  <xdje42@gmail.com>
 
 	* valops.c (value_cast_pointers): Fix whitespace.
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 57a94e14098..46e7ea56c73 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -578,11 +578,6 @@ extern void default_iterate_over_objfiles_in_search_order
 #define ALL_PSPACE_OBJFILES(ss, obj)					\
   for ((obj) = ss->objfiles; (obj) != NULL; (obj) = (obj)->next)
 
-#define ALL_PSPACE_OBJFILES_SAFE(ss, obj, nxt)		\
-  for ((obj) = ss->objfiles;			\
-       (obj) != NULL? ((nxt)=(obj)->next,1) :0;	\
-       (obj) = (nxt))
-
 #define ALL_OBJFILES(obj)			    \
   for ((obj) = current_program_space->objfiles; \
        (obj) != NULL;				    \
@@ -618,10 +613,6 @@ extern void default_iterate_over_objfiles_in_search_order
   ALL_OBJFILES (objfile)	 \
     ALL_OBJFILE_SYMTABS (objfile, s)
 
-#define ALL_PSPACE_SYMTABS(ss, objfile, s)		\
-  ALL_PSPACE_OBJFILES (ss, objfile)			\
-    ALL_OBJFILE_SYMTABS (objfile, s)
-
 /* Traverse all symtabs in all objfiles in the current program space,
    skipping included files (which share a blockvector with their
    primary symtab).  */
@@ -630,10 +621,6 @@ extern void default_iterate_over_objfiles_in_search_order
   ALL_OBJFILES (objfile)		\
     ALL_OBJFILE_PRIMARY_SYMTABS (objfile, s)
 
-#define ALL_PSPACE_PRIMARY_SYMTABS(pspace, objfile, s)	\
-  ALL_PSPACE_OBJFILES (ss, objfile)			\
-    ALL_OBJFILE_PRIMARY_SYMTABS (objfile, s)
-
 /* Traverse all minimal symbols in all objfiles in the current symbol
    space.  */