diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index c67b8d5fe7..d71bb44c80 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-08  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* load.c: Replace 'elf/internal.h' and 'elf/common.h' includes
+	with 'elf-bfd.h' include.
+	* trace.c: Add 'trace.h' include.
+
 2021-02-08  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* reg.c (trace_register_changes): Use PRIx64 in printf format
diff --git a/sim/rx/load.c b/sim/rx/load.c
index d74f4ff387..a8a473346c 100644
--- a/sim/rx/load.c
+++ b/sim/rx/load.c
@@ -28,8 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cpu.h"
 #include "mem.h"
 #include "load.h"
-#include "elf/internal.h"
-#include "elf/common.h"
+#include "elf-bfd.h"
 
 /* Helper function for invoking a GDB-specified printf.  */
 static void
diff --git a/sim/rx/trace.c b/sim/rx/trace.c
index 9d9f2dfd98..e5db49b5ca 100644
--- a/sim/rx/trace.c
+++ b/sim/rx/trace.c
@@ -34,6 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cpu.h"
 #include "mem.h"
 #include "load.h"
+#include "trace.h"
 
 static int
 sim_dis_read (bfd_vma memaddr, bfd_byte * ptr, unsigned int length,