-extern int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap);
-extern int arm966e_register_commands(struct command_context_s *cmd_ctx);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
+int arm966e_init_arch_info(struct target *target,
+ struct arm966e_common *arm966e, struct jtag_tap *tap);
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
+
+extern const struct command_registration arm966e_command_handlers[];