diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5234733407..06d66f9869 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  2 20:37:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* libbfd.c, bfd-in.h, hosts/alphaosf.h, hosts/sparc-ll.h, aoutf1.h,
+	sparclynx.c, Makefile.in: Change HOST_64_BIT to BFD_HOST_64_BIT.
+
 Wed Feb  2 12:30:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* coffswap.h (coff_swap_reloc_out): If RS6000COFF_C, handle type
diff --git a/bfd/hosts/alphaosf.h b/bfd/hosts/alphaosf.h
index bb341b6f31..670c2fc5aa 100644
--- a/bfd/hosts/alphaosf.h
+++ b/bfd/hosts/alphaosf.h
@@ -12,15 +12,15 @@
 
 /* Make the basic types 64-bit quantities on the host.
    Also provide the support macros BFD needs.  */
-#define	HOST_64_BIT	long
-#define sprintf_vma(s,x) sprintf (s, "%016lx", x) /* HOST_64_BIT */
-#define fprintf_vma(f,x) fprintf (f, "%016lx", x) /* HOST_64_BIT */
+#define	BFD_HOST_64_BIT	long
+#define sprintf_vma(s,x) sprintf (s, "%016lx", x) /* BFD_HOST_64_BIT */
+#define fprintf_vma(f,x) fprintf (f, "%016lx", x) /* BFD_HOST_64_BIT */
 
 #define BYTES_IN_PRINTF_INT 4
 
 /* These must have type unsigned long because they are used as
    arguments in printf functions.  */
-#define uint64_typeLOW(x) ((unsigned long) (((x) & 0xffffffff))) /* HOST_64_BIT */
-#define uint64_typeHIGH(x) ((unsigned long) (((x) >> 32) & 0xffffffff)) /* HOST_64_BIT */
+#define uint64_typeLOW(x) ((unsigned long) (((x) & 0xffffffff))) /* BFD_HOST_64_BIT */
+#define uint64_typeHIGH(x) ((unsigned long) (((x) >> 32) & 0xffffffff)) /* BFD_HOST_64_BIT */
 
 #include "fopen-same.h"
diff --git a/bfd/hosts/sparc-ll.h b/bfd/hosts/sparc-ll.h
index f2578d0cee..23fc3bdfe3 100644
--- a/bfd/hosts/sparc-ll.h
+++ b/bfd/hosts/sparc-ll.h
@@ -18,7 +18,7 @@
 #define SEEK_CUR 1
 
 /* Make the basic types 64-bit quantities on the host */
-#define	HOST_64_BIT	long long
+#define	BFD_HOST_64_BIT	long long
 
 extern int	abort	PARAMS ((void));
 extern int	close	PARAMS ((int));
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 5a120b1830..0d6b5fce2b 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -567,7 +567,7 @@ DESCRIPTION
 /* Sign extension to bfd_signed_vma.  */
 #define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000)
 #define COERCE32(x) (((bfd_signed_vma) (x) ^ 0x80000000) - 0x80000000)
-#define EIGHT_GAZILLION (((HOST_64_BIT)0x80000000) << 32)
+#define EIGHT_GAZILLION (((BFD_HOST_64_BIT)0x80000000) << 32)
 #define COERCE64(x) \
   (((bfd_signed_vma) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)