diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 1266ead605..107befc31c 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-19  Joel Brobecker  <brobecker@adacore.com>
+
+	* interp.c: #include "config.h" instead of "sysdep.h".
+	Add conditional include of string.h or strings.h, as well as
+	conditional include of stdlib.h.
+
 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 92f161bd95..23db647a33 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1,5 +1,5 @@
+#include "config.h"
 #include <signal.h>
-#include "sysdep.h"
 #include "bfd.h"
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
@@ -8,6 +8,18 @@
 #include "gdb/sim-d10v.h"
 #include "gdb/signals.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif /* HAVE_STRING_H */
+#endif /* HAVE_STRINGS_H */
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 enum _leftright { LEFT_FIRST, RIGHT_FIRST };
 
 static char *myname;