diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index 6fb2c752f00..b4f9653dbdf 100644
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -1,4 +1,4 @@
-/* $Id: scm.c,v 1.6 2001/06/17 20:36:35 ea Exp $
+/* $Id: scm.c,v 1.7 2001/06/25 14:19:56 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -379,11 +379,11 @@ SC_HANDLE STDCALL OpenSCManagerA(LPCSTR	lpMachineName,
    ANSI_STRING MachineNameA;
    ANSI_STRING DatabaseNameA;
    
-   RtlInitAnsiString(&MachineNameA, lpMachineName);
+   RtlInitAnsiString(&MachineNameA, (LPSTR)lpMachineName);
    RtlAnsiStringToUnicodeString(&MachineNameW,
 				&MachineNameA,
 				TRUE);
-   RtlInitAnsiString(&DatabaseNameA, lpDatabaseName);
+   RtlInitAnsiString(&DatabaseNameA, (LPSTR)lpDatabaseName);
    RtlAnsiStringToUnicodeString(&DatabaseNameW,
 				&DatabaseNameA,
 				TRUE);
@@ -410,7 +410,7 @@ SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR	lpMachineName,
 				 LPCWSTR	lpDatabaseName,			
 				 DWORD	dwDesiredAccess)
 {
-   HANDLE h;   
+   HANDLE h;
    
    if (lpMachineName == NULL ||
        wcslen(lpMachineName) == 0)
@@ -421,7 +421,7 @@ SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR	lpMachineName,
 	     return(NULL);
 	  }
 	
-	h = CreateFile(L"\\\\.\\pipe\\ntsrvctrl",
+	h = CreateFileW(L"\\\\.\\pipe\\ntsrvctrl",
 		       dwDesiredAccess,
 		       0,
 		       NULL,
diff --git a/reactos/lib/advapi32/service/sctrl.c b/reactos/lib/advapi32/service/sctrl.c
index 84cc0f4eeac..ddf2dae94bf 100644
--- a/reactos/lib/advapi32/service/sctrl.c
+++ b/reactos/lib/advapi32/service/sctrl.c
@@ -1,4 +1,4 @@
-/* $Id: sctrl.c,v 1.1 2000/03/26 22:00:07 dwelch Exp $
+/* $Id: sctrl.c,v 1.2 2001/06/25 14:19:56 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -191,7 +191,7 @@ BOOL STDCALL StartServiceCtrlDispatcherW(
      {
 	h = CreateThread(NULL,
 			 0,
-			 lpServiceStartTable[i].lpServiceProc,
+			 (LPTHREAD_START_ROUTINE)lpServiceStartTable[i].lpServiceProc,
 			 NULL,
 			 0,
 			 &Tid);
diff --git a/reactos/lib/crtdll/io/fmode.c b/reactos/lib/crtdll/io/fmode.c
index fc89be40a53..79347bd4620 100644
--- a/reactos/lib/crtdll/io/fmode.c
+++ b/reactos/lib/crtdll/io/fmode.c
@@ -5,5 +5,5 @@
 #undef _fmode
 unsigned int _fmode = O_TEXT;
 
-unsigned  int *_fmode_dll = &_fmode;       
+unsigned  int *_fmode_dll = &_fmode;
 
diff --git a/reactos/lib/crtdll/io/read.c b/reactos/lib/crtdll/io/read.c
index 520e2ec9a4b..e5dc4ad77c0 100644
--- a/reactos/lib/crtdll/io/read.c
+++ b/reactos/lib/crtdll/io/read.c
@@ -12,11 +12,11 @@
 
 size_t	_read(int _fd, void *_buf, size_t _nbyte)
 {
-   size_t _rbyte;
+   DWORD _rbyte;
    
-   if (!ReadFile(_get_osfhandle(_fd),_buf,_nbyte,&_rbyte,NULL)) 
+   if (!ReadFile(_get_osfhandle(_fd),_buf,_nbyte,&_rbyte,NULL))
      {
 	return -1;
      }
-   return _rbyte;
+   return (size_t)_rbyte;
 }
diff --git a/reactos/lib/crtdll/io/write.c b/reactos/lib/crtdll/io/write.c
index 51dac7b85f1..30f0f260b3c 100644
--- a/reactos/lib/crtdll/io/write.c
+++ b/reactos/lib/crtdll/io/write.c
@@ -14,10 +14,11 @@
 
 size_t _write(int _fd, const void *_buf, size_t _nbyte)
 {
-   size_t _wbyte;
+   DWORD _wbyte;
    
-   if ( !WriteFile(_get_osfhandle(_fd),_buf,_nbyte,&_wbyte,NULL) ) {
+   if ( !WriteFile(_get_osfhandle(_fd),_buf,_nbyte,&_wbyte,NULL) )
+   {
       return -1;
    }
-   return _wbyte;
+   return (size_t)_wbyte;
 }
diff --git a/reactos/lib/crtdll/process/_cwait.c b/reactos/lib/crtdll/process/_cwait.c
index 6b8d56b230f..628a72deb9f 100644
--- a/reactos/lib/crtdll/process/_cwait.c
+++ b/reactos/lib/crtdll/process/_cwait.c
@@ -12,15 +12,19 @@
 #include <crtdll/errno.h>
 #include <crtdll/internal/file.h>
 
-int	_cwait (int* pnStatus, int hProc, int nAction)
+int _cwait (int* pnStatus, int hProc, int nAction)
 {
+  DWORD ExitCode;
+
 	nAction = 0;
 	if ( WaitForSingleObject((void *)hProc,INFINITE) != WAIT_OBJECT_0 ) {
 		__set_errno(ECHILD);
 		return -1;
 	}
 
-	if ( !GetExitCodeProcess((void *)hProc,pnStatus) )
+	if ( !GetExitCodeProcess((void *)hProc,&ExitCode) )
 		return -1;
+	if (pnStatus != NULL)
+	  *pnStatus = (int)ExitCode;
 	return hProc;
 }
diff --git a/reactos/lib/crtdll/process/spawnl.c b/reactos/lib/crtdll/process/spawnl.c
index 433b76e2aaa..c2518d4f974 100644
--- a/reactos/lib/crtdll/process/spawnl.c
+++ b/reactos/lib/crtdll/process/spawnl.c
@@ -10,7 +10,7 @@ int _spawnl(int nMode, const char* szPath, const char* szArgv0,...)
   const char *a;
   int i = 1;
   va_list l = 0;
-  szArg[0]=szArgv0;
+  szArg[0]=(char*)szArgv0;
   va_start(l,szArgv0);
   do {
   	a = va_arg(l,const char *);
diff --git a/reactos/lib/crtdll/process/spawnle.c b/reactos/lib/crtdll/process/spawnle.c
index b913574c2ca..9a8e2dd13c4 100644
--- a/reactos/lib/crtdll/process/spawnle.c
+++ b/reactos/lib/crtdll/process/spawnle.c
@@ -10,7 +10,7 @@ int _spawnle(int mode, const char *path, const char *szArgv0, ... /*, const char
   char *ptr;
   int i = 1;
   va_list l = 0;
-  szArg[0]=szArgv0;
+  szArg[0]=(char*)szArgv0;
   va_start(l,szArgv0);
   do {
   	a = (char *)va_arg(l,const char *);
diff --git a/reactos/lib/crtdll/process/spawnve.c b/reactos/lib/crtdll/process/spawnve.c
index 058650af69a..1b698b99c29 100644
--- a/reactos/lib/crtdll/process/spawnve.c
+++ b/reactos/lib/crtdll/process/spawnve.c
@@ -181,6 +181,7 @@ int _spawnve(int mode, const char *path, char *const argv[], char *const envp[])
   int e = errno;
   int is_dir = 0;
   int found = 0;
+  DWORD ExitCode;
 
   if (path == 0 || argv[0] == 0)
   {
@@ -257,7 +258,8 @@ int _spawnve(int mode, const char *path, char *const argv[], char *const envp[])
   if (mode == P_WAIT)
   {
     WaitForSingleObject(ProcessInformation.hProcess,INFINITE);
-    GetExitCodeProcess(ProcessInformation.hProcess,&i);
+    GetExitCodeProcess(ProcessInformation.hProcess,&ExitCode);
+    i = (int)ExitCode;
   }
   return i;
 }
@@ -331,6 +333,6 @@ int _spawnvpe(int nMode, const char* szPath, char* const* szaArgv, char* const*
 {
  char rpath[FILENAME_MAX];
 
-  return _spawnve(nMode, find_exec(szPath,rpath), szaArgv, szaEnv);
+  return _spawnve(nMode, find_exec((char*)szPath,rpath), szaArgv, szaEnv);
 
 }
diff --git a/reactos/lib/crtdll/stdio/popen.c b/reactos/lib/crtdll/stdio/popen.c
index 72a723aee85..6ac7f6846d7 100644
--- a/reactos/lib/crtdll/stdio/popen.c
+++ b/reactos/lib/crtdll/stdio/popen.c
@@ -1,4 +1,5 @@
 
+#include <windows.h>
 #include <crtdll/io.h>
 #include <crtdll/errno.h>
 #include <crtdll/stdio.h>
@@ -11,7 +12,6 @@ _popen (const char *cm, const char *md) /* program name, pipe mode */
 {
   FILE *pf;
   HANDLE hReadPipe, hWritePipe;
-  HANDLE SpawnedProcess;
   STARTUPINFO StartupInfo;
   PROCESS_INFORMATION ProcessInformation;
 
@@ -28,7 +28,11 @@ _popen (const char *cm, const char *md) /* program name, pipe mode */
 	StartupInfo.hStdInput = hReadPipe;
   }
 	
-  SpawnedProcess = CreateProcessA("cmd.exe",(char *)cm,NULL,NULL,TRUE,CREATE_NEW_CONSOLE,NULL,NULL,&StartupInfo,&ProcessInformation );
+  if (CreateProcessA("cmd.exe",(char *)cm,NULL,NULL,TRUE,
+                     CREATE_NEW_CONSOLE,NULL,NULL,
+                     &StartupInfo,
+                     &ProcessInformation) == FALSE)
+    return NULL;
 
 
   if ( *md == 'r' ) {
@@ -38,7 +42,7 @@ _popen (const char *cm, const char *md) /* program name, pipe mode */
 	pf =  _fdopen( __fileno_alloc(hWritePipe, _fmode) , "w" );
   }
 
-  pf->_name_to_remove = SpawnedProcess; 
+  pf->_name_to_remove = ProcessInformation.hProcess;
 
   return pf;
 	
diff --git a/reactos/lib/crtdll/stdio/vfprintf.c b/reactos/lib/crtdll/stdio/vfprintf.c
index fb19270a093..a352918639b 100644
--- a/reactos/lib/crtdll/stdio/vfprintf.c
+++ b/reactos/lib/crtdll/stdio/vfprintf.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 #include <crtdll/stdio.h>
-#include <stdarg.h>
+#include <crtdll/stdarg.h>
 #include <crtdll/malloc.h>
 #include <crtdll/internal/file.h>
 
diff --git a/reactos/lib/crtdll/stdlib/splitp.c b/reactos/lib/crtdll/stdlib/splitp.c
index 82524aca225..9388ea050d1 100644
--- a/reactos/lib/crtdll/stdlib/splitp.c
+++ b/reactos/lib/crtdll/stdlib/splitp.c
@@ -32,7 +32,7 @@ void _splitpath( const char *path, char *drive, char *dir, char *fname, char *ex
 	else
 	{
 		*ext = 0; 
-		tmp_ext = path+strlen(path);
+		tmp_ext = (char*)path+strlen(path);
 	}
     if ( tmp_dir != NULL ) {
 		strncpy(fname,tmp_dir+1,tmp_ext - tmp_dir - 1);
diff --git a/reactos/lib/crtdll/sys_stat/stat.c b/reactos/lib/crtdll/sys_stat/stat.c
index 3a3e72d1283..f12d4b13b4b 100644
--- a/reactos/lib/crtdll/sys_stat/stat.c
+++ b/reactos/lib/crtdll/sys_stat/stat.c
@@ -11,7 +11,7 @@ int _stat( const char *path, struct stat *buffer )
  WIN32_FIND_DATA wfd;
  HANDLE fh;
   fh = FindFirstFile (path,&wfd);
-  if ( fh == -1 )
+  if ( fh == INVALID_HANDLE_VALUE )
   {
     __set_errno(ENOFILE);
     return -1;
diff --git a/reactos/lib/fmifs/fmifs_specs b/reactos/lib/fmifs/fmifs_specs
deleted file mode 100644
index f9cd789df25..00000000000
--- a/reactos/lib/fmifs/fmifs_specs
+++ /dev/null
@@ -1,78 +0,0 @@
-*asm:
-
-
-*asm_final:
-
-
-*cpp:
--remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE}
-
-*cc1:
-%(cc1_spec) 
-
-*cc1plus:
-
-
-*endfile:
-
-
-*link:
-%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12}
-
-*lib:
-
-
-*libgcc:
--lgcc
-
-*startfile:
-
-
-*switches_need_spaces:
-
-
-*signed_char:
-%{funsigned-char:-D__CHAR_UNSIGNED__}
-
-*predefines:
--Di386 -D_WIN32 -DWIN32 -D__WIN32__   -D__MINGW32__ -DWINNT  -D_X86_=1 -D__STDC__=1  -D__stdcall=__attribute__((__stdcall__))   -D_stdcall=__attribute__((__stdcall__))   -D__cdecl=__attribute__((__cdecl__))   -D__declspec(x)=__attribute__((x))   -Asystem(winnt) -Acpu(i386) -Amachine(i386)
-
-*cross_compile:
-1
-
-*version:
-egcs-2.91.57
-
-*multilib:
-. ;
-
-*multilib_defaults:
-
-
-*multilib_extra:
-
-
-*multilib_matches:
-
-
-*linker:
-collect2
-
-*cpp_486:
-%{!ansi:-Di486} -D__i486 -D__i486__
-
-*cpp_586:
-%{!ansi:-Di586 -Dpentium} 	-D__i586 -D__i586__ -D__pentium -D__pentium__
-
-*cpp_686:
-%{!ansi:-Di686 -Dpentiumpro} 	-D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__
-
-*cpp_cpu_default:
-%(cpp_586)
-
-*cpp_cpu:
--Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}}
-
-*cc1_cpu:
-%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}}
-
diff --git a/reactos/lib/fmifs/makefile b/reactos/lib/fmifs/makefile
index 81d81b03ca8..5fc72e3192c 100644
--- a/reactos/lib/fmifs/makefile
+++ b/reactos/lib/fmifs/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.11 2000/11/20 19:59:08 ekohl Exp $
+# $Id: makefile,v 1.12 2001/06/25 14:20:44 ekohl Exp $
 #
 # Makefile for fmifs.dll
 #
@@ -34,11 +34,15 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def
 		--kill-at \
 		--output-lib $(TARGET).a
 	$(CC) \
-		-specs=$(TARGET)_specs \
+		$(TARGET).o \
+		../ntdll/ntdll.a \
+		../kernel32/kernel32.a \
+		-nostartfiles \
+		-nostdlib \
 		-mdll \
 		-o junk.tmp \
-		-Wl,--base-file,base.tmp \
-		$(TARGET).o
+		-Wl,--entry=_DllMain@12\
+		-Wl,--base-file,base.tmp 
 	- $(RM) junk.tmp
 	$(DLLTOOL) \
 		--dllname $(TARGET).dll \
@@ -47,10 +51,14 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def
 		--def $(TARGET).edf
 	- $(RM) base.tmp
 	$(CC) \
-		-specs=$(TARGET)_specs \
+		$(TARGET).o \
+		../ntdll/ntdll.a \
+		../kernel32/kernel32.a \
+		-nostartfiles \
+		-nostdlib \
 		-mdll \
 		-o $(TARGET).dll \
-		$(TARGET).o \
+		-Wl,--entry=_DllMain@12\
 		-Wl,--image-base,0x76df0000 \
 		-Wl,--file-alignment,0x1000 \
 		-Wl,--section-alignment,0x1000 \