diff --git a/include/cpu.h b/include/cpu.h
index 23f1aa5e..4a2d14aa 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: cpu.h,v 1.54 2008-05-21 21:29:15 c2woody Exp $ */
+/* $Id: cpu.h,v 1.55 2008-08-24 16:43:06 qbix79 Exp $ */
 
 #ifndef DOSBOX_CPU_H
 #define DOSBOX_CPU_H
@@ -481,12 +481,12 @@ extern CPUBlock cpu;
 INLINE void CPU_SetFlagsd(Bitu word) {
 	Bitu mask=cpu.cpl ? FMASK_NORMAL : FMASK_ALL;
 	CPU_SetFlags(word,mask);
-};
+}
 
 INLINE void CPU_SetFlagsw(Bitu word) {
 	Bitu mask=(cpu.cpl ? FMASK_NORMAL : FMASK_ALL) & 0xffff;
 	CPU_SetFlags(word,mask);
-};
+}
 
 
 #endif
diff --git a/include/logging.h b/include/logging.h
index 37a5afa3..fa349718 100644
--- a/include/logging.h
+++ b/include/logging.h
@@ -9,13 +9,13 @@ enum LOG_TYPES {
 	LOG_PIT,LOG_KEYBOARD,LOG_PIC,
 	LOG_MOUSE,LOG_BIOS,LOG_GUI,LOG_MISC,
 	LOG_IO,
-	LOG_MAX,
+	LOG_MAX
 };
 
 enum LOG_SEVERITIES {
 	LOG_NORMAL,
 	LOG_WARN,
-	LOG_ERROR,
+	LOG_ERROR
 };
 
 #if C_DEBUG
diff --git a/include/mapper.h b/include/mapper.h
index c9b51f1f..aea28945 100644
--- a/include/mapper.h
+++ b/include/mapper.h
@@ -21,7 +21,7 @@
 
 enum MapKeys {
 	MK_f1,MK_f2,MK_f3,MK_f4,MK_f5,MK_f6,MK_f7,MK_f8,MK_f9,MK_f10,MK_f11,MK_f12,
-	MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause,
+	MK_return,MK_kpminus,MK_scrolllock,MK_printscreen,MK_pause
 
 };
 
diff --git a/include/mem.h b/include/mem.h
index 436dc384..f9128dad 100644
--- a/include/mem.h
+++ b/include/mem.h
@@ -61,47 +61,47 @@ MemHandle MEM_NextHandleAt(MemHandle handle,Bitu where);
 
 INLINE Bit8u host_readb(HostPt off) {
 	return off[0];
-};
+}
 INLINE Bit16u host_readw(HostPt off) {
 	return off[0] | (off[1] << 8);
-};
+}
 INLINE Bit32u host_readd(HostPt off) {
 	return off[0] | (off[1] << 8) | (off[2] << 16) | (off[3] << 24);
-};
+}
 INLINE void host_writeb(HostPt off,Bit8u val) {
 	off[0]=val;
-};
+}
 INLINE void host_writew(HostPt off,Bit16u val) {
 	off[0]=(Bit8u)(val);
 	off[1]=(Bit8u)(val >> 8);
-};
+}
 INLINE void host_writed(HostPt off,Bit32u val) {
 	off[0]=(Bit8u)(val);
 	off[1]=(Bit8u)(val >> 8);
 	off[2]=(Bit8u)(val >> 16);
 	off[3]=(Bit8u)(val >> 24);
-};
+}
 
 #else
 
 INLINE Bit8u host_readb(HostPt off) {
 	return *(Bit8u *)off;
-};
+}
 INLINE Bit16u host_readw(HostPt off) {
 	return *(Bit16u *)off;
-};
+}
 INLINE Bit32u host_readd(HostPt off) {
 	return *(Bit32u *)off;
-};
+}
 INLINE void host_writeb(HostPt off,Bit8u val) {
 	*(Bit8u *)(off)=val;
-};
+}
 INLINE void host_writew(HostPt off,Bit16u val) {
 	*(Bit16u *)(off)=val;
-};
+}
 INLINE void host_writed(HostPt off,Bit32u val) {
 	*(Bit32u *)(off)=val;
-};
+}
 
 #endif
 
diff --git a/include/mixer.h b/include/mixer.h
index 70162024..af0ebbc0 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -33,7 +33,7 @@ enum BlahModes {
 
 enum MixerModes {
 	M_8M,M_8S,
-	M_16M,M_16S,
+	M_16M,M_16S
 };
 
 #define MIXER_BUFSIZE (16*1024)
diff --git a/include/regs.h b/include/regs.h
index 0f5a0c41..8f8445f4 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -118,7 +118,7 @@ enum {
 
 enum {
 	REGI_AL, REGI_CL, REGI_DL, REGI_BL,
-	REGI_AH, REGI_CH, REGI_DH, REGI_BH,
+	REGI_AH, REGI_CH, REGI_DH, REGI_BH
 };
 
 
diff --git a/include/vga.h b/include/vga.h
index 7815586b..c995dfe0 100644
--- a/include/vga.h
+++ b/include/vga.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: vga.h,v 1.43 2008-08-08 21:56:36 c2woody Exp $ */
+/* $Id: vga.h,v 1.44 2008-08-24 16:43:06 qbix79 Exp $ */
 
 #ifndef DOSBOX_VGA_H
 #define DOSBOX_VGA_H
@@ -41,7 +41,7 @@ enum VGAModes {
 	M_TEXT,
 	M_HERC_GFX, M_HERC_TEXT,
 	M_CGA16, M_TANDY2, M_TANDY4, M_TANDY16, M_TANDY_TEXT,
-	M_ERROR,
+	M_ERROR
 };
 
 
diff --git a/include/video.h b/include/video.h
index 980f5410..de4bbace 100644
--- a/include/video.h
+++ b/include/video.h
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: video.h,v 1.24 2008-02-21 19:25:04 c2woody Exp $ */
+/* $Id: video.h,v 1.25 2008-08-24 16:43:06 qbix79 Exp $ */
 
 #ifndef DOSBOX_VIDEO_H
 #define DOSBOX_VIDEO_H
@@ -26,7 +26,7 @@
 typedef enum {
 	GFX_CallBackReset,
 	GFX_CallBackStop,
-	GFX_CallBackRedraw,
+	GFX_CallBackRedraw
 } GFX_CallBackFunctions_t;
 
 typedef void (*GFX_CallBack_t)( GFX_CallBackFunctions_t function );