/* FIXME: This is unnecessarily necessary: */
#include "ansidecl.h"
-#include "callback.h"
-#include "remote-sim.h"
+#include "gdb/callback.h"
+#include "gdb/remote-sim.h"
#include "sim-module.h"
+/* FIXME: Revisit. */
+#ifdef HAVE_DV_SOCKSER
MODULE_INSTALL_FN dv_sockser_install;
#define MODULE_LIST dv_sockser_install,
+#endif
/* Define this if the simulator supports profiling.
See the mips simulator for an example.