diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 046f0881f7..547182c5cf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-09  H.J. Lu  <hjl@gnu.org>
+
+	* bfd-in.h (bfd_elf_sprintf_vma, bfd_elf_fprintf_vma): Moved
+	to ...
+	* elf-bfd.h: Here.
+	* bfd-in2.h: Regenerated.
+
 2001-08-09  H.J. Lu  <hjl@gnu.org>
 
 	* bfd-in.h (bfd_sprintf_vma): New prototype.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 146aac2050..d2efc5c0b9 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -185,8 +185,6 @@ typedef unsigned long bfd_size_type;
 
 extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
 extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
-extern void bfd_elf_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
-extern void bfd_elf_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
 
 #define printf_vma(x) fprintf_vma(stdout,x)
 #define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index ee45a95197..481215a5be 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -185,8 +185,6 @@ typedef unsigned long bfd_size_type;
 
 extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
 extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
-extern void bfd_elf_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
-extern void bfd_elf_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
 
 #define printf_vma(x) fprintf_vma(stdout,x)
 #define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 7c67cb57b6..b0e20ea9aa 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -999,6 +999,9 @@ extern void bfd_elf_print_symbol PARAMS ((bfd *, PTR, asymbol *,
 #define bfd_elf32_print_symbol	bfd_elf_print_symbol
 #define bfd_elf64_print_symbol	bfd_elf_print_symbol
 
+extern void bfd_elf_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
+extern void bfd_elf_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
+
 extern unsigned long bfd_elf_hash PARAMS ((const char *));
 
 extern bfd_reloc_status_type bfd_elf_generic_reloc PARAMS ((bfd *,