--- a/src/aica/armcore.h	Tue Jan 15 20:50:23 2008 +0000
+++ b/src/aica/armcore.h	Mon Jul 14 07:44:42 2008 +0000
@@ -16,14 +16,18 @@
  * GNU General Public License for more details.
  */
 
-#ifndef dream_armcore_H
-#define dream_armcore_H 1
+#ifndef lxdream_armcore_H
+#define lxdream_armcore_H 1
 
 #include "lxdream.h"
 #include "mem.h"
 #include <stdint.h>
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ARM_BASE_RATE 2 /* MHZ */
 extern uint32_t arm_cpu_freq;
 extern uint32_t arm_cpu_period;
@@ -107,4 +111,9 @@
 int32_t arm_read_phys_word( uint32_t addr );
 int arm_has_page( uint32_t addr );
 void arm_mem_init(void);
-#endif /* !dream_armcore_H */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !lxdream_armcore_H */