--- a/src/aica/armcore.h	Tue Oct 09 08:12:29 2007 +0000
+++ b/src/aica/armcore.h	Sun Jun 22 06:49:00 2008 +0000
@@ -1,5 +1,5 @@
 /**
- * $Id: armcore.h,v 1.15 2007-10-09 08:11:51 nkeynes Exp $
+ * $Id$
  * 
  * Interface definitions for the ARM CPU emulation core proper.
  *
@@ -19,7 +19,8 @@
 #ifndef dream_armcore_H
 #define dream_armcore_H 1
 
-#include "dream.h"
+#include "lxdream.h"
+#include "mem.h"
 #include <stdint.h>
 #include <stdio.h>
 
@@ -88,8 +89,8 @@
 void arm_save_state( FILE *f );
 int arm_load_state( FILE *f );
 gboolean arm_execute_instruction( void );
-void arm_set_breakpoint( uint32_t pc, int type );
-gboolean arm_clear_breakpoint( uint32_t pc, int type );
+void arm_set_breakpoint( uint32_t pc, breakpoint_type_t type );
+gboolean arm_clear_breakpoint( uint32_t pc, breakpoint_type_t type );
 int arm_get_breakpoint( uint32_t pc );
 
 /* ARM Memory */