diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fd58ef9c1b..e86faa1c8a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 Wed Mar  2 11:57:03 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
+	* som.[ch]: Do not include libhppa.h in som.c, instead include
+	it in som.h.
+
+	* elf32-hppa.[ch]: Do not include libhppa.h in elf32-hppa.c, instead
+	include it in elf32-hppa.h.
+
 	* som.c (log2): Return -1 on error rather than aborting.
 	(setup_sections): Bubble up an error from log2.
 
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 151a44b134..6486565167 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -40,7 +40,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 	November 19, 1992.  */
 
 #include "elf32-hppa.h"
-#include "libhppa.h"
 #include "aout/aout64.h"
 #include "hppa_stubs.h"
 
diff --git a/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
index eb8c8bd547..af264c050b 100644
--- a/bfd/elf32-hppa.h
+++ b/bfd/elf32-hppa.h
@@ -32,6 +32,7 @@
 #define _ELF32_HPPA_H
 
 #include "libelf.h"
+#include "libhppa.h"
 
 /* ELF/HPPA relocation types */
 
diff --git a/bfd/som.c b/bfd/som.c
index 66c68e9a9f..daeb9f9e97 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -27,7 +27,6 @@
 
 #include "libbfd.h"
 #include "som.h"
-#include "libhppa.h"
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/bfd/som.h b/bfd/som.h
index 00554802cc..977e0557f9 100644
--- a/bfd/som.h
+++ b/bfd/som.h
@@ -24,6 +24,7 @@
 #define _SOM_H
 
 #include "../bfd/sysdep.h"
+#include "libhppa.h"
 
 #include <a.out.h>
 #include <lst.h>