diff --git a/build/jam/HelperRules b/build/jam/HelperRules
index 951628a027..d2ace6708d 100644
--- a/build/jam/HelperRules
+++ b/build/jam/HelperRules
@@ -242,7 +242,7 @@ rule SetIncludePropertiesVariables
 	} else {
 		$(prefix)_INCLUDES_SEPARATOR = ;
 		$(prefix)_LOCAL_INCLUDES_OPTION = "-iquote " ;
-		$(prefix)_SYSTEM_INCLUDES_OPTION = "-idirafter " ;
+		$(prefix)_SYSTEM_INCLUDES_OPTION = "-I " ;
 	}
 }
 
diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h
index 3792d1c4c9..1e2a6314db 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -184,7 +184,7 @@ enum alignment {
 	B_ALIGN_HORIZONTAL_CENTER	= B_ALIGN_CENTER,
 
 	B_ALIGN_HORIZONTAL_UNSET	= -1L,
-	B_ALIGN_USE_FULL_WIDTH		= -2L,
+	B_ALIGN_USE_FULL_WIDTH		= -2L
 };
 
 enum vertical_alignment {
@@ -196,7 +196,7 @@ enum vertical_alignment {
 
 	B_ALIGN_VERTICAL_UNSET		= -1L,
 	B_ALIGN_NO_VERTICAL			= B_ALIGN_VERTICAL_UNSET,
-	B_ALIGN_USE_FULL_HEIGHT		= -2L,
+	B_ALIGN_USE_FULL_HEIGHT		= -2L
 };
 
 /*----------------------------------------------------------------*/
@@ -347,7 +347,7 @@ enum color_which {
 	B_WINDOW_TAB_COLOR = 3,
 	B_WINDOW_TEXT_COLOR = 22,
 	B_WINDOW_INACTIVE_TAB_COLOR = 23,
-	B_WINDOW_INACTIVE_TEXT_COLOR = 24,
+	B_WINDOW_INACTIVE_TEXT_COLOR = 24
 };
 
 _IMPEXP_BE rgb_color	ui_color(color_which which);
diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h
index b470768120..7a37dbca92 100644
--- a/headers/os/kernel/OS.h
+++ b/headers/os/kernel/OS.h
@@ -27,7 +27,7 @@ extern "C" {
 enum {
 	B_TIMEOUT			= 8,	/* relative timeout */
 	B_RELATIVE_TIMEOUT	= 8,	/* fails after a relative timeout with B_WOULD_BLOCK */
-	B_ABSOLUTE_TIMEOUT	= 16,	/* fails after an absolute timeout with B_WOULD BLOCK */
+	B_ABSOLUTE_TIMEOUT	= 16	/* fails after an absolute timeout with B_WOULD BLOCK */
 };
 
 /*-------------------------------------------------------------*/
@@ -161,7 +161,7 @@ enum {
 	B_DO_NOT_RESCHEDULE			= 0x02,	// thread is not rescheduled
 	B_RELEASE_ALL				= 0x08,	// all waiting threads will be woken up,
 										// count will be zeroed
-	B_RELEASE_IF_WAITING_ONLY	= 0x10,	// release count only if there are any
+	B_RELEASE_IF_WAITING_ONLY	= 0x10	// release count only if there are any
 										// threads waiting
 };
 
@@ -233,7 +233,7 @@ typedef struct {
 enum {
 	/* compatible to sys/resource.h RUSAGE_SELF and RUSAGE_CHILDREN */
 	B_TEAM_USAGE_SELF		= 0,
-	B_TEAM_USAGE_CHILDREN	= -1,
+	B_TEAM_USAGE_CHILDREN	= -1
 };
 
 /* system private, use macros instead */
@@ -536,7 +536,7 @@ typedef enum cpu_types {
 	B_CPU_M68K,
 	B_CPU_ARM,
 	B_CPU_SH,
-	B_CPU_SPARC,
+	B_CPU_SPARC
 } cpu_type;
 
 #define B_CPU_x86_VENDOR_MASK	0xff00
diff --git a/headers/os/support/Errors.h b/headers/os/support/Errors.h
index 76e25e1ab7..24a768e891 100644
--- a/headers/os/support/Errors.h
+++ b/headers/os/support/Errors.h
@@ -72,7 +72,7 @@ enum {
 	B_MISSING_LIBRARY,
 	B_MISSING_SYMBOL,
 
-	B_DEBUGGER_ALREADY_INSTALLED = B_OS_ERROR_BASE + 0x400,
+	B_DEBUGGER_ALREADY_INSTALLED = B_OS_ERROR_BASE + 0x400
 };
 
 /* Application Kit Errors */
@@ -276,7 +276,7 @@ enum {
 	B_DEV_FIFO_UNDERRUN,
 	B_DEV_PENDING,
 	B_DEV_MULTIPLE_ERRORS,
-	B_DEV_TOO_LATE,
+	B_DEV_TOO_LATE
 };
 
 #endif	/* _ERRORS_H */
diff --git a/headers/posix/ctype.h b/headers/posix/ctype.h
index 493ffea050..4bbc7a4117 100644
--- a/headers/posix/ctype.h
+++ b/headers/posix/ctype.h
@@ -37,7 +37,7 @@ enum {
 	_ISxdigit = 0x1000,		/* hexadecimal digit */
 	_ISspace = 0x2000,		/* white space */
 	_ISprint = 0x4000,		/* printing */
-	_ISgraph = 0x8000,		/* graphical */
+	_ISgraph = 0x8000		/* graphical */
 };
 
 /* Characteristics */
diff --git a/headers/posix/stdio_pre.h b/headers/posix/stdio_pre.h
index e15e96ad79..c63e53f4bc 100644
--- a/headers/posix/stdio_pre.h
+++ b/headers/posix/stdio_pre.h
@@ -12,7 +12,7 @@
 
 typedef struct _IO_FILE FILE;
 
-#define __PRINTFLIKE(format, varargs) __attribute__ ((__format__ (__printf__, format, varargs)));
+#define __PRINTFLIKE(format, varargs) __attribute__ ((__format__ (__printf__, format, varargs)))
 #define __SCANFLIKE(format, varargs) __attribute__((__format__ (__scanf__, format, varargs)))
 
 #endif	/* _STDIO_PRE_H_ */