diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index 64d52ab242f..6925db8ee88 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -47,8 +47,8 @@ VOID PsTerminateCurrentThread(NTSTATUS ExitStatus);
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 KeAreApcsDisabled(
 	VOID
 	)
diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index 8583a4745c8..575be795d89 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.47 2004/08/15 16:39:05 chorns Exp $
+/* $Id: catch.c,v 1.48 2004/08/21 21:19:06 tamlin Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -251,8 +251,8 @@ ExSystemExceptionFilter()
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 KeDeregisterBugCheckReasonCallback(
     IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord
     )
@@ -264,8 +264,8 @@ KeDeregisterBugCheckReasonCallback(
 /*
  * @unimplemented
  */
-STDCALL
 ULONG
+STDCALL
 KeGetRecommendedSharedDataAlignment(
 	VOID
 	)
@@ -277,8 +277,8 @@ KeGetRecommendedSharedDataAlignment(
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 KeRegisterBugCheckReasonCallback(
     IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord,
     IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine,
diff --git a/reactos/ntoskrnl/ke/i386/usercall.c b/reactos/ntoskrnl/ke/i386/usercall.c
index a47fd942544..84d3fd9c574 100644
--- a/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@@ -1,4 +1,4 @@
-/* $Id: usercall.c,v 1.28 2004/08/15 16:39:05 chorns Exp $
+/* $Id: usercall.c,v 1.29 2004/08/21 21:20:08 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -120,8 +120,8 @@ KeAddSystemServiceTable (
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 KeRemoveSystemServiceTable(
     IN PUCHAR Number
 )
@@ -133,8 +133,8 @@ KeRemoveSystemServiceTable(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 KeUserModeCallback(
     IN ULONG	FunctionID,
     IN PVOID	InputBuffer,
diff --git a/reactos/ntoskrnl/ke/process.c b/reactos/ntoskrnl/ke/process.c
index 3481f290bb5..79b5b88e79b 100644
--- a/reactos/ntoskrnl/ke/process.c
+++ b/reactos/ntoskrnl/ke/process.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: process.c,v 1.24 2004/08/19 21:47:51 hbirr Exp $
+/* $Id: process.c,v 1.25 2004/08/21 21:19:06 tamlin Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/process.c
@@ -113,8 +113,8 @@ KeDetachProcess (VOID)
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 KeStackAttachProcess (
     IN PKPROCESS Process,
     OUT PRKAPC_STATE ApcState
@@ -126,8 +126,8 @@ KeStackAttachProcess (
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 KeUnstackDetachProcess (
     IN PRKAPC_STATE ApcState
     )
diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index e52f24e51cc..3d66253f4d0 100644
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.22 2004/08/15 16:39:05 chorns Exp $
+/* $Id: spinlock.c,v 1.23 2004/08/21 21:19:06 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -56,8 +56,8 @@ KeSynchronizeExecution (PKINTERRUPT		Interrupt,
 /*
  * @unimplemented
  */
-STDCALL
 KIRQL
+STDCALL
 KeAcquireInterruptSpinLock(
     IN PKINTERRUPT Interrupt
     )
@@ -197,8 +197,8 @@ KiAcquireSpinLock(PKSPIN_LOCK SpinLock)
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 KeReleaseInterruptSpinLock(
 	IN PKINTERRUPT Interrupt,
 	IN KIRQL OldIrql
diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c
index 5b5c1a5be96..7223b04768f 100644
--- a/reactos/ntoskrnl/ke/timer.c
+++ b/reactos/ntoskrnl/ke/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.76 2004/08/15 16:39:05 chorns Exp $
+/* $Id: timer.c,v 1.77 2004/08/21 21:19:06 tamlin Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -472,8 +472,8 @@ KeQueryTickCount(PLARGE_INTEGER TickCount)
 /*
  * @unimplemented
  */
-STDCALL
 ULONG
+STDCALL
 KeQueryRuntimeThread(
 	IN PKTHREAD Thread,
 	OUT PULONG UserTime
@@ -486,8 +486,8 @@ KeQueryRuntimeThread(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 KeSetTimeIncrement(
     IN ULONG MaxIncrement,
     IN ULONG MinIncrement
@@ -759,8 +759,8 @@ KeSetTimeUpdateNotifyRoutine(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 KeUpdateRunTime(
 	IN PKTRAP_FRAME	TrapFrame
 )
@@ -771,8 +771,8 @@ KeUpdateRunTime(
 /*
  * @unimplemented
  */
-STDCALL
 VOID 
+STDCALL
 KeUpdateSystemTime(
 	IN PKTRAP_FRAME TrapFrame,
 	IN ULONG        Increment