diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index e5386eb3b5..0dd6216c1f 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -47,9 +47,7 @@
 #  include <stdint.h>
 #endif
 
-/* The content of this file is only meaningful for the case of a kernel build. */
-
-#ifdef CONFIG_NUTTX_KERNEL
+#ifdef CONFIG_LIB_SYSCALL
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/include/syscall.h b/include/syscall.h
index ae888e9c2b..9c54d3773e 100644
--- a/include/syscall.h
+++ b/include/syscall.h
@@ -58,7 +58,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif