diff --git a/reactos/apps/tests/apc/apc.c b/reactos/apps/tests/apc/apc.c
index 969f60a1803..c30ced1aaf9 100644
--- a/reactos/apps/tests/apc/apc.c
+++ b/reactos/apps/tests/apc/apc.c
@@ -21,12 +21,11 @@ VOID STDCALL ApcRoutine(PVOID Context,
 			PIO_STATUS_BLOCK IoStatus,
 			ULONG Reserved)
 {
-   printf("(apc.exe) ApcRoutine(Context %x)\n", Context);
+   printf("(apc.exe) ApcRoutine(Context %p)\n", Context);
 }
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
-   int i;
    NTSTATUS Status;
    HANDLE FileHandle;
    OBJECT_ATTRIBUTES ObjectAttributes;
@@ -48,7 +47,7 @@ void main(int argc, char* argv[])
    if (EventHandle == INVALID_HANDLE_VALUE)
      {
 	printf("Failed to create event\n");
-	return;
+	return 0;
      }
    
    printf("Opening file\n");
@@ -71,13 +70,13 @@ void main(int argc, char* argv[])
    if (FileHandle == INVALID_HANDLE_VALUE)
      {
 	printf("Open failed\n");
-	return;
+	return 0;
      }
    printf("Reading file\n");
    Status = ZwReadFile(FileHandle,
 			NULL,
-			ApcRoutine,
-			0xdeadbeef,
+			(PIO_APC_ROUTINE)ApcRoutine,
+			(PVOID)0xdeadbeef,
 			&IoStatus,
 			Buffer,
 			256,
@@ -93,5 +92,6 @@ void main(int argc, char* argv[])
    ZwClose(FileHandle);
    printf("Program finished\n");
    for(;;);
+   return 0;
 }
 
diff --git a/reactos/apps/tests/thread/thread.c b/reactos/apps/tests/thread/thread.c
index ebeae809f25..05921e96ca8 100644
--- a/reactos/apps/tests/thread/thread.c
+++ b/reactos/apps/tests/thread/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.5 2000/01/30 20:55:51 hochoa Exp $
+/* $Id: thread.c,v 1.6 2000/01/31 20:24:27 ekohl Exp $
  *
  *
  *
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <windows.h>
+#include <stdlib.h>
 
 #define NR_THREADS (10)
 
@@ -16,17 +17,17 @@ DWORD WINAPI thread_main1(LPVOID param)
 {
    ULONG s;
    
-   printf("Thread %d running\n", (DWORD)param);
+   printf("Thread %ld running\n", (DWORD)param);
    s = nr = ((nr * 1103515245) + 12345) & 0x7fffffff;
    s = s % 10;
-   printf("s %d\n", s);
+   printf("s %ld\n", s);
    Sleep(s);
-   printf("Thread %d finished\n", (DWORD)param);
+   printf("Thread %ld finished\n", (DWORD)param);
    return 0;
 }
 
 // Shows the help on how to use these program to the user
-void showHelp()
+void showHelp(void)
 {
 
 printf("\nReactOS threads test program (built on %s).\n\n", __DATE__);
@@ -53,7 +54,7 @@ int main (int argc, char* argv[])
    }
 		
    nr = atoi(argv[1]);
-   printf("Seed %d\n", nr);
+   printf("Seed %ld\n", nr);
    
    printf("Creating %d threads...\n",NR_THREADS*2);
    for (i=0;i<NR_THREADS;i++)