diff --git a/gdb/solib.c b/gdb/solib.c
index f914822d209..5280e5ffefd 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1739,7 +1739,7 @@ remove_user_added_objfile (struct objfile *objfile)
 {
   if (objfile != 0 && objfile->flags & OBJF_USERLOADED)
     {
-      for (struct so_list *so : current_program_space->solibs ())
+      for (struct so_list *so : objfile->pspace->solibs ())
 	if (so->objfile == objfile)
 	  so->objfile = NULL;
     }
diff --git a/gdb/symfile.c b/gdb/symfile.c
index aca31e30d6e..dc2f6258ce2 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3749,7 +3749,7 @@ static void
 symfile_free_objfile (struct objfile *objfile)
 {
   /* Remove the target sections owned by this objfile.  */
-  current_program_space->remove_target_sections (objfile);
+  objfile->pspace->remove_target_sections (objfile);
 }
 
 /* Wrapper around the quick_symbol_functions expand_symtabs_matching "method".