diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1eee3fe4a6..c135046d23 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+Mon Nov  8 18:13:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* reloc.c: Use const instead of CONST.
+	(bfd_perform_relocation): Make variable howto a const pointer.
+	* bfd-in2.h, libbfd.h: Rebuilt.
+
+Mon Nov  8 12:19:15 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (realclean): Don't remove generated headers.  Reverts
+	change of 2 Jul 1993.
+
 Mon Nov  8 06:08:31 1993  D. V. Henkel-Wallace  (gumby@cirdan.cygnus.com)
 
 	* configure.bfd: make unixware equivalent to sysv4.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index a81a0add9d..359078a4ee 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -490,7 +490,7 @@ bfd_create PARAMS ((CONST char *filename, bfd *templ));
  /* Byte swapping macros for user section data.  */
 
 #define bfd_put_8(abfd, val, ptr) \
-                (*((unsigned char *)(ptr)) = (unsigned char)val)
+                (*((unsigned char *)(ptr)) = (unsigned char)(val))
 #define bfd_put_signed_8 \
 		bfd_put_8
 #define bfd_get_8(abfd, ptr) \
@@ -1001,7 +1001,7 @@ typedef struct reloc_cache_entry
   bfd_vma addend;    
 
         /* Pointer to how to perform the required relocation */
-  CONST struct reloc_howto_struct *howto;
+  const struct reloc_howto_struct *howto;
 
 } arelent;
 enum complain_overflow
@@ -1356,26 +1356,10 @@ typedef enum bfd_reloc_code_real
    /* this must be the highest numeric value */
   BFD_RELOC_UNUSED
  } bfd_reloc_code_real_type;
-CONST struct reloc_howto_struct *
+const struct reloc_howto_struct *
 
 bfd_reloc_type_lookup  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 
-unsigned int 
-bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
-
-unsigned int 
-bfd_canonicalize_reloc
- PARAMS ((bfd *abfd,
-    asection *sec,
-    arelent **loc,
-    asymbol	**syms));
-
-void 
-bfd_set_reloc
- PARAMS ((bfd *abfd, sec_ptr *sec, arelent **rel, unsigned int count)
-    
-    );
-
 
 typedef struct symbol_cache_entry 
 {
@@ -1647,6 +1631,22 @@ struct _bfd
     asymbol **ld_symbols;
 };
 
+unsigned int 
+bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
+
+unsigned int 
+bfd_canonicalize_reloc
+ PARAMS ((bfd *abfd,
+    asection *sec,
+    arelent **loc,
+    asymbol	**syms));
+
+void 
+bfd_set_reloc
+ PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count)
+    
+    );
+
 boolean 
 bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags));
 
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 4bc87d49bf..34f196827f 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -193,10 +193,10 @@ void
 bfd_check_init PARAMS ((void));
 
 PTR  
-bfd_xmalloc PARAMS (( bfd_size_type size));
+bfd_xmalloc  PARAMS ((bfd_size_type size));
 
 PTR 
-bfd_xmalloc_by_size_t  PARAMS (( size_t size));
+bfd_xmalloc_by_size_t  PARAMS ((size_t size));
 
 void 
 bfd_write_bigendian_4byte_int PARAMS ((bfd *abfd,  int i));
@@ -225,7 +225,7 @@ bfd_constructor_entry PARAMS ((bfd *abfd,
     asymbol **symbol_ptr_ptr,
     CONST char*type));
 
-CONST struct reloc_howto_struct *
+const struct reloc_howto_struct *
 bfd_default_reloc_type_lookup
  PARAMS ((bfd *abfd AND
     bfd_reloc_code_real_type  code));