diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d3ed11267c..c5f0e79d8b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 14 14:34:45 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
+
+	* libbfd-in.h (struct artdata):  Add armap_timestamp and
+	armap_datepos here too.
+
 Mon Sep 13 21:03:18 1993  John Gilmore  (gnu@cacophony.cygnus.com)
 
 	Improve timestamp support in BSD archive files to avoid linker
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index f89264da05..0f9a2cdba3 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -44,6 +44,14 @@ struct artdata {
   carsym *symdefs;		/* the symdef entries */
   symindex symdef_count;             /* how many there are */
   char *extended_names;		/* clever intel extension */
+  time_t armap_timestamp;	/* Timestamp value written into armap.
+				   This is used for BSD archives to check
+				   that the timestamp is recent enough
+				   for the BSD linker to not complain,
+				   just before we finish writing an
+				   archive.  */
+  file_ptr armap_datepos;	/* Position within archive to seek to
+				   rewrite the date field.  */
 };
 
 #define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
@@ -98,47 +106,6 @@ boolean	bfd_add_to_string_table PARAMS ((char **table, char *new_string,
 					 unsigned int *table_length,
 					 char **free_ptr));
 
-/* Byte swapping routines from libbfd.c */
-
-/* namespace protection */
-#define _do_getb64		_bfd__do_getb64
-#define _do_getl64		_bfd__do_getl64
-#define _do_getb_signed_64	_bfd__do_getb_signed_64
-#define _do_getl_signed_64	_bfd__do_getl_signed_64
-#define _do_getb32 		_bfd__do_getb32
-#define _do_getl32 		_bfd__do_getl32
-#define _do_getb_signed_32 	_bfd__do_getb_signed_32
-#define _do_getl_signed_32 	_bfd__do_getl_signed_32
-#define _do_getb16 		_bfd__do_getb16
-#define _do_getl16 		_bfd__do_getl16
-#define _do_getb_signed_16 	_bfd__do_getb_signed_16
-#define _do_getl_signed_16 	_bfd__do_getl_signed_16
-#define _do_putb64 		_bfd__do_putb64
-#define _do_putl64 		_bfd__do_putl64
-#define _do_putb32 		_bfd__do_putb32
-#define _do_putl32 		_bfd__do_putl32
-#define _do_putb16 		_bfd__do_putb16
-#define _do_putl16 		_bfd__do_putl16
-
-bfd_vma		_do_getb64	   PARAMS ((unsigned char *addr));     
-bfd_vma 	_do_getl64	   PARAMS ((unsigned char *addr));     
-bfd_signed_vma	_do_getb_signed_64 PARAMS ((unsigned char *addr));     
-bfd_signed_vma	_do_getl_signed_64 PARAMS ((unsigned char *addr));     
-bfd_vma		_do_getb32	   PARAMS ((unsigned char *addr));
-bfd_vma		_do_getl32	   PARAMS ((unsigned char *addr));
-bfd_signed_vma	_do_getb_signed_32 PARAMS ((unsigned char *addr));
-bfd_signed_vma	_do_getl_signed_32 PARAMS ((unsigned char *addr));
-bfd_vma		_do_getb16	   PARAMS ((unsigned char *addr));
-bfd_vma		_do_getl16	   PARAMS ((unsigned char *addr));
-bfd_signed_vma	_do_getb_signed_16 PARAMS ((unsigned char *addr));
-bfd_signed_vma	_do_getl_signed_16 PARAMS ((unsigned char *addr));
-void		_do_putb64	   PARAMS ((bfd_vma data, unsigned char *addr));
-void		_do_putl64	   PARAMS ((bfd_vma data, unsigned char *addr));
-void		_do_putb32	   PARAMS ((bfd_vma data, unsigned char *addr));
-void		_do_putl32	   PARAMS ((bfd_vma data, unsigned char *addr));
-void		_do_putb16	   PARAMS ((bfd_vma data, unsigned char *addr));
-void		_do_putl16	   PARAMS ((bfd_vma data, unsigned char *addr));
-
 boolean	bfd_false PARAMS ((bfd *ignore));
 boolean	bfd_true PARAMS ((bfd *ignore));
 PTR	bfd_nullvoidptr PARAMS ((bfd *ignore));