#include "arch-utils.h"
#include "dwarf2-frame.h"
-#include "common/errors.h"
+#include "gdbsupport/errors.h"
#include "frame-unwind.h"
#include "gdbcore.h"
#include "gdbcmd.h"
#include "opcode/s12z.h"
#include "trad-frame.h"
#include "remote.h"
-#include "opcodes/s12z-opc.h"
+#include "../opcodes/s12z-opc.h"
/* Two of the registers included in S12Z_N_REGISTERS are
the CCH and CCL "registers" which are just views into