diff --git a/src/cpu/core_dyn_x86/decoder.h b/src/cpu/core_dyn_x86/decoder.h
index 16b7e129..0d91df16 100644
--- a/src/cpu/core_dyn_x86/decoder.h
+++ b/src/cpu/core_dyn_x86/decoder.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: decoder.h,v 1.56 2009-03-27 18:10:35 c2woody Exp $ */
+/* $Id: decoder.h,v 1.57 2009-03-29 17:32:20 qbix79 Exp $ */
 
 #define X86_DYNFPU_DH_ENABLED
 #define X86_INLINED_MEMACCESS
@@ -277,7 +277,7 @@ static INLINE void dyn_set_eip_last(void) {
 }
 
 
-enum save_info_type {exception, cycle_check, normal, fpu_restore};
+enum save_info_type {db_exception, cycle_check, normal, fpu_restore};
 
 
 static struct {
@@ -309,7 +309,7 @@ static void dyn_check_bool_exception(DynReg * check) {
 	save_info[used_save_info].cycles=decode.cycles;
 	save_info[used_save_info].eip_change=decode.op_start-decode.code_start;
 	if (!cpu.code.big) save_info[used_save_info].eip_change&=0xffff;
-	save_info[used_save_info].type=exception;
+	save_info[used_save_info].type=db_exception;
 	used_save_info++;
 }
 
@@ -321,7 +321,7 @@ static void dyn_check_bool_exception_al(void) {
 	save_info[used_save_info].cycles=decode.cycles;
 	save_info[used_save_info].eip_change=decode.op_start-decode.code_start;
 	if (!cpu.code.big) save_info[used_save_info].eip_change&=0xffff;
-	save_info[used_save_info].type=exception;
+	save_info[used_save_info].type=db_exception;
 	used_save_info++;
 }
 
@@ -348,7 +348,7 @@ static void dyn_check_bool_exception_ne(void) {
 	save_info[used_save_info].cycles=decode.cycles;
 	save_info[used_save_info].eip_change=decode.op_start-decode.code_start;
 	if (!cpu.code.big) save_info[used_save_info].eip_change&=0xffff;
-	save_info[used_save_info].type=exception;
+	save_info[used_save_info].type=db_exception;
 	used_save_info++;
 }
 
@@ -356,7 +356,7 @@ static void dyn_fill_blocks(void) {
 	for (Bitu sct=0; sct<used_save_info; sct++) {
 		gen_fill_branch_long(save_info[sct].branch_pos);
 		switch (save_info[sct].type) {
-			case exception:
+			case db_exception:
 				dyn_loadstate(&save_info[sct].state);
 				decode.cycles=save_info[sct].cycles;
 				dyn_save_critical_regs();
diff --git a/src/cpu/core_dyn_x86/string.h b/src/cpu/core_dyn_x86/string.h
index f0d29247..256a8af2 100644
--- a/src/cpu/core_dyn_x86/string.h
+++ b/src/cpu/core_dyn_x86/string.h
@@ -23,7 +23,7 @@ enum STRING_OP {
 	STR_LODSB=12,STR_LODSW,STR_LODSD,
 	STR_STOSB=16,STR_STOSW,STR_STOSD,
 	STR_SCASB=20,STR_SCASW,STR_SCASD,
-	STR_CMPSB=24,STR_CMPSW,STR_CMPSD,
+	STR_CMPSB=24,STR_CMPSW,STR_CMPSD
 };
 
 static void dyn_string(STRING_OP op) {
diff --git a/src/cpu/core_dynrec/decoder_basic.h b/src/cpu/core_dynrec/decoder_basic.h
index 541cb70a..4f821246 100644
--- a/src/cpu/core_dynrec/decoder_basic.h
+++ b/src/cpu/core_dynrec/decoder_basic.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: decoder_basic.h,v 1.13 2008-09-19 16:48:02 c2woody Exp $ */
+/* $Id: decoder_basic.h,v 1.14 2009-03-29 17:32:20 qbix79 Exp $ */
 
 
 /*
@@ -31,7 +31,7 @@
 // instructions that use one operand
 enum SingleOps {
 	SOP_INC,SOP_DEC,
-	SOP_NOT,SOP_NEG,
+	SOP_NOT,SOP_NEG
 };
 
 // instructions that use two operand
@@ -42,7 +42,7 @@ enum DualOps {
 	DOP_AND,DOP_OR,
 	DOP_TEST,
 	DOP_MOV,
-	DOP_XCHG,
+	DOP_XCHG
 };
 
 // shift and rotate functions
@@ -50,7 +50,7 @@ enum ShiftOps {
 	SHIFT_ROL,SHIFT_ROR,
 	SHIFT_RCL,SHIFT_RCR,
 	SHIFT_SHL,SHIFT_SHR,
-	SHIFT_SAL,SHIFT_SAR,
+	SHIFT_SAL,SHIFT_SAR
 };
 
 // branch conditions
@@ -69,7 +69,7 @@ enum StringOps {
 	STR_LODSB=12,STR_LODSW,STR_LODSD,
 	STR_STOSB=16,STR_STOSW,STR_STOSD,
 	STR_SCASB=20,STR_SCASW,STR_SCASD,
-	STR_CMPSB=24,STR_CMPSW,STR_CMPSD,
+	STR_CMPSB=24,STR_CMPSW,STR_CMPSD
 };
 
 // repeat prefix type (for string operations)
@@ -84,7 +84,7 @@ enum LoopTypes {
 
 // rotate operand type
 enum grp2_types {
-	grp2_1,grp2_imm,grp2_cl,
+	grp2_1,grp2_imm,grp2_cl
 };
 
 // opcode mapping for group1 instructions
@@ -569,7 +569,7 @@ static DRC_PTR_SIZE_IM INLINE gen_call_function_mm(void * func,Bitu op1,Bitu op2
 
 
 
-enum save_info_type {exception, cycle_check, string_break};
+enum save_info_type {db_exception, cycle_check, string_break};
 
 
 // function that is called on exceptions
@@ -613,7 +613,7 @@ static void dyn_fill_blocks(void) {
 	for (Bitu sct=0; sct<used_save_info_dynrec; sct++) {
 		gen_fill_branch_long(save_info_dynrec[sct].branch_pos);
 		switch (save_info_dynrec[sct].type) {
-			case exception:
+			case db_exception:
 				// code for exception handling, load cycles and call DynRunException
 				decode.cycles=save_info_dynrec[sct].cycles;
 				if (cpu.code.big) gen_call_function_II((void *)&DynRunException,save_info_dynrec[sct].eip_change,save_info_dynrec[sct].cycles);
@@ -652,7 +652,7 @@ static void dyn_check_exception(HostReg reg) {
 	// in case of an exception eip will point to the start of the current instruction
 	save_info_dynrec[used_save_info_dynrec].eip_change=decode.op_start-decode.code_start;
 	if (!cpu.code.big) save_info_dynrec[used_save_info_dynrec].eip_change&=0xffff;
-	save_info_dynrec[used_save_info_dynrec].type=exception;
+	save_info_dynrec[used_save_info_dynrec].type=db_exception;
 	used_save_info_dynrec++;
 }
 
diff --git a/src/cpu/core_full/support.h b/src/cpu/core_full/support.h
index 32b92620..59287409 100644
--- a/src/cpu/core_full/support.h
+++ b/src/cpu/core_full/support.h
@@ -46,7 +46,7 @@ enum {
 	D_CPUID,
 	D_HLT,D_CLTS,
 	D_LOCK,D_ICEBP,
-	L_ERROR,
+	L_ERROR
 };
 
 
@@ -95,7 +95,7 @@ enum {
 	O_BSFw,O_BSRw,O_BSFd,O_BSRd,
 
 	O_BSWAP,O_CMPXCHG,
-	O_FPU,
+	O_FPU
 
 
 };
@@ -117,7 +117,7 @@ enum {
 	S_AIPw,S_C_AIPw,
 	S_AIPd,S_C_AIPd,
 
-	S_IP,S_IPIw,
+	S_IP,S_IPIw
 };
 
 enum {
@@ -127,7 +127,7 @@ enum {
 	R_LODSB,R_LODSW,R_LODSD,
 	R_STOSB,R_STOSW,R_STOSD,
 	R_SCASB,R_SCASW,R_SCASD,
-	R_CMPSB,R_CMPSW,R_CMPSD,
+	R_CMPSB,R_CMPSW,R_CMPSD
 };
 
 enum {
@@ -149,7 +149,7 @@ enum {
 	M_GRP,
 	M_GRP_Ib,M_GRP_CL,M_GRP_1,
 
-	M_POPw,M_POPd,
+	M_POPw,M_POPd
 };
 
 struct OpCode {
diff --git a/src/cpu/core_normal/string.h b/src/cpu/core_normal/string.h
index 855397ad..6fdfc7bd 100644
--- a/src/cpu/core_normal/string.h
+++ b/src/cpu/core_normal/string.h
@@ -5,7 +5,7 @@ enum STRING_OP {
 	R_LODSB,R_LODSW,R_LODSD,
 	R_STOSB,R_STOSW,R_STOSD,
 	R_SCASB,R_SCASW,R_SCASD,
-	R_CMPSB,R_CMPSW,R_CMPSD,
+	R_CMPSB,R_CMPSW,R_CMPSD
 };
 
 #define LoadD(_BLAH) _BLAH
diff --git a/src/cpu/core_normal/table_ea.h b/src/cpu/core_normal/table_ea.h
index d09012e6..9b5d1108 100644
--- a/src/cpu/core_normal/table_ea.h
+++ b/src/cpu/core_normal/table_ea.h
@@ -76,7 +76,7 @@ static INLINE PhysPt Sib(Bitu mode) {
 	}
 	base+=*SIBIndex[(sib >> 3) &7] << (sib >> 6);
 	return base;
-};
+}
 
 static PhysPt EA_32_00_n(void) { return BaseDS+reg_eax; }
 static PhysPt EA_32_01_n(void) { return BaseDS+reg_ecx; }