diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 42ef34a3b2..509e739585 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* top.h (readnow_symbol_files, readnever_symbol_files): Move
+	declarations to ...
+	* symfile.h: ... here.
+	* symfile.c: Update doc.
+
 2021-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* target.h (baud_rate, serial_parity): Move declarations...
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 82693f9136..ec5d34ac78 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -85,8 +85,14 @@ using clear_symtab_users_cleanup
   = FORWARD_SCOPE_EXIT (clear_symtab_users);
 
 /* Global variables owned by this file.  */
-int readnow_symbol_files;	/* Read full symbols immediately.  */
-int readnever_symbol_files;	/* Never read full symbols.  */
+
+/* See symfile.h.  */
+
+int readnow_symbol_files;
+
+/* See symfile.h.  */
+
+int readnever_symbol_files;
 
 /* Functions this file defines.  */
 
diff --git a/gdb/symfile.h b/gdb/symfile.h
index a6f8fafc89..23e2ad8c3a 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -641,4 +641,12 @@ extern gdb_bfd_ref_ptr find_separate_debug_file_in_section (struct objfile *);
 
 extern bool separate_debug_file_debug;
 
+/* Read full symbols immediately.  */
+
+extern int readnow_symbol_files;
+
+/* Never read full symbols.  */
+
+extern int readnever_symbol_files;
+
 #endif /* !defined(SYMFILE_H) */
diff --git a/gdb/top.h b/gdb/top.h
index a08f448778..a31b19ae95 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -273,10 +273,6 @@ extern void set_prompt (const char *s);
 
 extern int gdb_in_secondary_prompt_p (struct ui *ui);
 
-/* From random places.  */
-extern int readnow_symbol_files;
-extern int readnever_symbol_files;
-
 /* Perform _initialize initialization.  */
 extern void gdb_init (char *);