diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile
index 0a9ebdaf58..6b7b95169f 100644
--- a/src/system/kernel/Jamfile
+++ b/src/system/kernel/Jamfile
@@ -47,7 +47,7 @@ KernelMergeObject kernel_core.o :
 ;
 
 # We need to specify the dependency on the generated syscalls files explicitly.
-Includes [ FGristFiles syscalls.c ]
+Includes [ FGristFiles syscalls.cpp ]
 	: <syscalls>syscall_dispatcher.h <syscalls>syscall_table.h ;
 
 KernelLd linkhack.so :
diff --git a/src/tools/gensyscalls/gensyscalls.cpp b/src/tools/gensyscalls/gensyscalls.cpp
index 786c45e9d7..b7dccc9875 100644
--- a/src/tools/gensyscalls/gensyscalls.cpp
+++ b/src/tools/gensyscalls/gensyscalls.cpp
@@ -396,7 +396,7 @@ public:
 				paramSize = parameter->Offset() + parameter->UsedSize();
 
 			// output the info for the syscall
-			file << "\t{ " << syscall->KernelName() << ", "
+			file << "\t{ (void *)" << syscall->KernelName() << ", "
 				<< paramSize << " }," << endl;
 		}