diff --git a/sim/common/cgen-utils.c b/sim/common/cgen-utils.c
index 03b4913219..d8e57bfb5b 100644
--- a/sim/common/cgen-utils.c
+++ b/sim/common/cgen-utils.c
@@ -24,10 +24,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "decode.h"
 
 #define MEMOPS_DEFINE_INLINE
-#include "cgen-mem.h"
+#include "mem-ops.h"
 
 #define SEMOPS_DEFINE_INLINE
-#include "cgen-sem.h"
+#include "sem-ops.h"
 
 const char *mode_names[] = {
   "VM",
diff --git a/sim/common/genmloop.sh b/sim/common/genmloop.sh
index c5e5c1c45a..fb35220575 100644
--- a/sim/common/genmloop.sh
+++ b/sim/common/genmloop.sh
@@ -35,8 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "sim-main.h"
 #include "bfd.h"
-#include "cgen-mem.h"
-#include "cgen-sem.h"
+#include "mem-ops.h"
+#include "sem-ops.h"
 #include "cgen-scache.h"
 #include "cpu-opc.h"
 #include "cpu-sim.h"