diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index aaf9cf7aa23..dcf48eb5afb 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.76 2004/08/18 15:09:02 navaraf Exp $
+/* $Id: device.c,v 1.77 2004/08/21 20:51:25 tamlin Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -159,8 +159,8 @@ IoAttachDeviceByPointer(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoAttachDeviceToDeviceStackSafe(
     IN PDEVICE_OBJECT SourceDevice,
     IN PDEVICE_OBJECT TargetDevice,
@@ -217,8 +217,8 @@ IoDeleteDevice(PDEVICE_OBJECT DeviceObject)
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoEnumerateDeviceObjectList(
     IN  PDRIVER_OBJECT  DriverObject,
     IN  PDEVICE_OBJECT  *DeviceObjectList,
@@ -234,8 +234,8 @@ IoEnumerateDeviceObjectList(
 /*
  * @unimplemented
  */
-STDCALL
 PDEVICE_OBJECT
+STDCALL
 IoGetDeviceAttachmentBaseRef(
     IN PDEVICE_OBJECT DeviceObject
     )
@@ -247,8 +247,8 @@ IoGetDeviceAttachmentBaseRef(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoGetDiskDeviceObject(
     IN  PDEVICE_OBJECT  FileSystemDeviceObject,
     OUT PDEVICE_OBJECT  *DiskDeviceObject
@@ -261,8 +261,8 @@ IoGetDiskDeviceObject(
 /*
  * @unimplemented
  */
-STDCALL
 PDEVICE_OBJECT
+STDCALL
 IoGetLowerDeviceObject(
     IN  PDEVICE_OBJECT  DeviceObject
     )
@@ -685,8 +685,8 @@ IoOpenDeviceInstanceKey(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoRegisterBootDriverReinitialization(
     IN PDRIVER_OBJECT DriverObject,
     IN PDRIVER_REINITIALIZE DriverReinitializationRoutine,
@@ -700,8 +700,8 @@ IoRegisterBootDriverReinitialization(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoRegisterLastChanceShutdownNotification(
     IN PDEVICE_OBJECT DeviceObject
     )
@@ -729,8 +729,8 @@ IoQueryDeviceEnumInfo(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoSetStartIoAttributes(
     IN PDEVICE_OBJECT DeviceObject,
     IN BOOLEAN DeferredStartIo,
@@ -743,8 +743,8 @@ IoSetStartIoAttributes(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoSynchronousInvalidateDeviceRelations(
     IN PDEVICE_OBJECT DeviceObject,
     IN DEVICE_RELATION_TYPE Type
@@ -757,8 +757,8 @@ IoSynchronousInvalidateDeviceRelations(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoValidateDeviceIoControlAccess(
     IN  PIRP    Irp,
     IN  ULONG   RequiredAccess
diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c
index 84bdfedbfae..44765f750b3 100644
--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@@ -1,4 +1,4 @@
-/* $Id: driver.c,v 1.49 2004/08/15 16:39:03 chorns Exp $
+/* $Id: driver.c,v 1.50 2004/08/21 20:51:25 tamlin Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -1468,8 +1468,8 @@ IopReinitializeDrivers(VOID)
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCreateDriver (
 	IN PUNICODE_STRING DriverName,   OPTIONAL
 	IN PDRIVER_INITIALIZE InitializationFunction
@@ -1482,8 +1482,8 @@ IoCreateDriver (
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoDeleteDriver (
 	IN PDRIVER_OBJECT DriverObject
 	)
diff --git a/reactos/ntoskrnl/io/errlog.c b/reactos/ntoskrnl/io/errlog.c
index 776302199c5..0231c627ce8 100644
--- a/reactos/ntoskrnl/io/errlog.c
+++ b/reactos/ntoskrnl/io/errlog.c
@@ -1,4 +1,4 @@
-/* $Id: errlog.c,v 1.18 2004/08/15 16:39:03 chorns Exp $
+/* $Id: errlog.c,v 1.19 2004/08/21 20:51:26 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -382,8 +382,8 @@ IoAllocateErrorLogEntry (IN PVOID IoObject,
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoFreeErrorLogEntry(
     PVOID ElEntry
     )
diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index 79eafb6952e..64b7621ff65 100644
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.33 2004/08/15 16:39:03 chorns Exp $
+/* $Id: file.c,v 1.34 2004/08/21 20:51:26 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -168,8 +168,8 @@ NtSetQuotaInformationFile(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCheckQuerySetFileInformation(
     IN FILE_INFORMATION_CLASS FileInformationClass,
     IN ULONG Length,
@@ -183,8 +183,8 @@ IoCheckQuerySetFileInformation(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCheckQuerySetVolumeInformation(
     IN FS_INFORMATION_CLASS FsInformationClass,
     IN ULONG Length,
@@ -198,8 +198,8 @@ IoCheckQuerySetVolumeInformation(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCheckQuotaBufferValidity(
     IN PFILE_QUOTA_INFORMATION QuotaBuffer,
     IN ULONG QuotaLength,
@@ -213,8 +213,8 @@ IoCheckQuotaBufferValidity(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCreateFileSpecifyDeviceObjectHint(
     OUT PHANDLE FileHandle,
     IN ACCESS_MASK DesiredAccess,
@@ -240,8 +240,8 @@ IoCreateFileSpecifyDeviceObjectHint(
 /*
  * @unimplemented
  */
-STDCALL
 PFILE_OBJECT
+STDCALL
 IoCreateStreamFileObjectEx(
     IN PFILE_OBJECT FileObject OPTIONAL,
     IN PDEVICE_OBJECT DeviceObject OPTIONAL,
@@ -254,8 +254,8 @@ IoCreateStreamFileObjectEx(
 /*
  * @unimplemented
  */
-STDCALL
 PFILE_OBJECT
+STDCALL
 IoCreateStreamFileObjectLite(
     IN PFILE_OBJECT FileObject OPTIONAL,
     IN PDEVICE_OBJECT DeviceObject OPTIONAL
@@ -268,8 +268,8 @@ IoCreateStreamFileObjectLite(
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 IoIsFileOriginRemote(
     IN PFILE_OBJECT FileObject
     )
@@ -281,8 +281,8 @@ IoIsFileOriginRemote(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoQueryFileDosDeviceName(
     IN PFILE_OBJECT FileObject,
     OUT POBJECT_NAME_INFORMATION *ObjectNameInformation
@@ -518,8 +518,8 @@ NtSetInformationFile(HANDLE FileHandle,
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoSetFileOrigin(
     IN PFILE_OBJECT FileObject,
     IN BOOLEAN Remote
diff --git a/reactos/ntoskrnl/io/fs.c b/reactos/ntoskrnl/io/fs.c
index e76cea08455..f70e66f8421 100644
--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@@ -52,8 +52,8 @@ IopNotifyFileSystemChange(PDEVICE_OBJECT DeviceObject,
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoCancelFileOpen(
     IN PDEVICE_OBJECT  DeviceObject,
     IN PFILE_OBJECT    FileObject
diff --git a/reactos/ntoskrnl/io/iocomp.c b/reactos/ntoskrnl/io/iocomp.c
index 1f8475f223c..7a1369b4522 100644
--- a/reactos/ntoskrnl/io/iocomp.c
+++ b/reactos/ntoskrnl/io/iocomp.c
@@ -65,8 +65,8 @@ NtpDeleteIoCompletion(PVOID ObjectBody)
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoSetCompletionRoutineEx(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
@@ -84,8 +84,8 @@ IoSetCompletionRoutineEx(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoSetIoCompletion (
 	IN PVOID IoCompletion,
 	IN PVOID KeyContext,
diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index 1a85b40f0fa..505ea0300bb 100644
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.66 2004/08/18 02:24:02 navaraf Exp $
+/* $Id: irp.c,v 1.67 2004/08/21 20:51:26 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -44,8 +44,8 @@
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 IoForwardIrpSynchronously(
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp
@@ -72,8 +72,8 @@ IoFreeIrp(PIRP Irp)
 /*
  * @unimplemented
  */
-STDCALL
 ULONG
+STDCALL
 IoGetRequestorProcessId(
     IN PIRP Irp
     )
@@ -85,8 +85,8 @@ IoGetRequestorProcessId(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoGetRequestorSessionId(
 	IN PIRP Irp,
 	OUT PULONG pSessionId
@@ -100,8 +100,8 @@ IoGetRequestorSessionId(
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 IoIsValidNameGraftingBuffer(
     IN PIRP Irp,
     IN PREPARSE_DATA_BUFFER ReparseBuffer
diff --git a/reactos/ntoskrnl/io/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr.c
index 650129c1089..e3f273eeba0 100644
--- a/reactos/ntoskrnl/io/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr.c
@@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.32 2004/08/15 16:39:03 chorns Exp $
+/* $Id: pnpmgr.c,v 1.33 2004/08/21 20:55:41 tamlin Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -188,8 +188,8 @@ IoOpenDeviceRegistryKey(
 /*
  * @unimplemented
  */
-STDCALL
 VOID
+STDCALL
 IoRequestDeviceEject(
     IN PDEVICE_OBJECT PhysicalDeviceObject
     )
diff --git a/reactos/ntoskrnl/io/pnpnotify.c b/reactos/ntoskrnl/io/pnpnotify.c
index ba2622d788b..501f6159951 100644
--- a/reactos/ntoskrnl/io/pnpnotify.c
+++ b/reactos/ntoskrnl/io/pnpnotify.c
@@ -18,8 +18,8 @@
 /*
  * @unimplemented
  */
-STDCALL
 ULONG
+STDCALL
 IoPnPDeliverServicePowerNotification(
 	ULONG		VetoedPowerOperation OPTIONAL,
 	ULONG		PowerNotification,
diff --git a/reactos/ntoskrnl/io/process.c b/reactos/ntoskrnl/io/process.c
index 3909a39f823..413c92ce821 100644
--- a/reactos/ntoskrnl/io/process.c
+++ b/reactos/ntoskrnl/io/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.18 2004/08/15 16:39:03 chorns Exp $
+/* $Id: process.c,v 1.19 2004/08/21 20:55:41 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -58,8 +58,8 @@ IoGetStackLimits(OUT PULONG LowLimit,
 /*
  * @unimplemented
  */
-STDCALL
 BOOLEAN
+STDCALL
 IoIsSystemThread(
     IN PETHREAD Thread
     )
diff --git a/reactos/ntoskrnl/io/xhaldisp.c b/reactos/ntoskrnl/io/xhaldisp.c
index 38d5afad674..1d10b08d235 100644
--- a/reactos/ntoskrnl/io/xhaldisp.c
+++ b/reactos/ntoskrnl/io/xhaldisp.c
@@ -1,4 +1,4 @@
-/* $Id: xhaldisp.c,v 1.10 2004/08/15 16:39:03 chorns Exp $
+/* $Id: xhaldisp.c,v 1.11 2004/08/21 20:55:40 tamlin Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -69,8 +69,8 @@ IoAssignDriveLetters(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoCreateDisk(
     IN PDEVICE_OBJECT DeviceObject,
     IN struct _CREATE_DISK* Disk
@@ -83,8 +83,8 @@ IoCreateDisk(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoGetBootDiskInformation(
     IN OUT PBOOTDISK_INFORMATION BootDiskInformation,
     IN ULONG Size
@@ -98,8 +98,8 @@ IoGetBootDiskInformation(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoReadDiskSignature(
     IN PDEVICE_OBJECT DeviceObject,
     IN ULONG BytesPerSector,
@@ -113,8 +113,8 @@ IoReadDiskSignature(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoReadPartitionTableEx(
     IN PDEVICE_OBJECT DeviceObject,
     IN struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout
@@ -127,8 +127,8 @@ IoReadPartitionTableEx(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoSetPartitionInformationEx(
     IN PDEVICE_OBJECT DeviceObject,
     IN ULONG PartitionNumber,
@@ -142,8 +142,8 @@ IoSetPartitionInformationEx(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoSetSystemPartition(
     PUNICODE_STRING VolumeNameString
     )
@@ -155,8 +155,8 @@ IoSetSystemPartition(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoVerifyPartitionTable(
     IN PDEVICE_OBJECT DeviceObject,
     IN BOOLEAN FixErrors
@@ -169,8 +169,8 @@ IoVerifyPartitionTable(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoVolumeDeviceToDosName(
     IN  PVOID           VolumeDeviceObject,
     OUT PUNICODE_STRING DosName
@@ -183,8 +183,8 @@ IoVolumeDeviceToDosName(
 /*
  * @unimplemented
  */
-STDCALL
 NTSTATUS
+STDCALL
 IoWritePartitionTableEx(
     IN PDEVICE_OBJECT DeviceObject,
     IN struct _DRIVE_LAYOUT_INFORMATION_EX* DriveLayfout