diff --git a/Headers/Additions/GNUstepBase/Win32_Utilities.h b/Headers/Additions/GNUstepBase/Win32_Utilities.h
index 5a588b1e9..072e089da 100644
--- a/Headers/Additions/GNUstepBase/Win32_Utilities.h
+++ b/Headers/Additions/GNUstepBase/Win32_Utilities.h
@@ -26,6 +26,8 @@
 #ifndef __Win32_Utilities_h_GNUSTEP_BASE_INCLUDE
 #define __Win32_Utilities_h_GNUSTEP_BASE_INCLUDE
 
+#include <Foundation/NSString.h>
+
 /* TODO:
 - Win32GetUserProfileDirectory()
 Find profile directory for non-current user.
@@ -56,4 +58,4 @@ NSString     *Win32GetUserProfileDirectory(NSString *userName);
 NSString     *Win32FindDirectory( DWORD DirCLSID );
 #endif /* defined(__WIN32__) */
 
-#endif /* */
\ No newline at end of file
+#endif /* */
diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile
index 9c24b546d..42c03202a 100644
--- a/Source/win32/GNUmakefile
+++ b/Source/win32/GNUmakefile
@@ -32,7 +32,7 @@ SUBPROJECT_NAME = win32
 win32_OBJC_FILES =\
 	GSRunLoopCtxt.m \
 	GSRunLoopWatcher.m \
-	NSRunLoopWin33.m \
+	NSRunLoopWin32.m \
 	Win32Support.m \
 	Win32_Utilities.m
 
diff --git a/Source/win32/Win32Support.m b/Source/win32/Win32Support.m
index 8be48e08c..09787f80e 100644
--- a/Source/win32/Win32Support.m
+++ b/Source/win32/Win32Support.m
@@ -21,14 +21,15 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
   */
 
-#include "Win32_Utilities.h"
-//#include "Win32_FileManagement.h"
+#include "GNUstepBase/Win32_Utilities.h"
+//#include "GNUstepBase/Win32_FileManagement.h"
 
 /*
  * Perform any and all necessary initialisation for supporting Win32
  * Called after first part of library initialisation so some Obj-C is okay
  */
-void Win32Initialise(void)
+void 
+Win32Initialise(void)
 {
   /* We call the initialisation routines of all support modules in turn */
   Win32_Utilities_init();
@@ -38,9 +39,10 @@ void Win32Initialise(void)
 /*
  * Free and finalise all things for supporting Win32
  */
-void Win32Finalise(void)
+void 
+Win32Finalise(void)
 {
   /* We call the finalisation routines of all support modules in turn */
-  Win32_Utilities_fini(void);
+  Win32_Utilities_fini();
 // Win32_FileManagement_fini();
 }
diff --git a/Source/win32/Win32_Utilities.m b/Source/win32/Win32_Utilities.m
index 8fd3c5634..e812a9d06 100644
--- a/Source/win32/Win32_Utilities.m
+++ b/Source/win32/Win32_Utilities.m
@@ -21,10 +21,12 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
   */
 #include <Foundation/NSString.h>
-#include <Foundation/NSProcessInfo.h>
 #include <Foundation/NSException.h>
+#include <Foundation/NSLock.h>
+#include <Foundation/NSPathUtilities.h>
+#include <Foundation/NSProcessInfo.h>
 
-#include "Win32_Utilities.h"
+#include "GNUstepBase/Win32_Utilities.h"
 
 /* ------------------ */
 /* Internal Variables */
@@ -125,8 +127,9 @@ Win32NSStringFromEnvironmentVariable(const char * envVar)
  * Locates the users profile directory, roughly equivalent to ~/ on unix
  */
 NSString *
-Win32GetUserProfileDirectory(NSString *userName)
+Win32GetUserProfileDirectory(NSString *loginName)
 {
+  NSString *s;
   if ([loginName isEqual: NSUserName()] == YES)
     {
       [gnustep_global_lock lock];
@@ -174,21 +177,23 @@ Win32GetUserProfileDirectory(NSString *userName)
  * Locates specified directory on Win32 systems
  */
 NSString *
-Win32FindDirectory( int DirCSIDL)
+Win32FindDirectory( DWORD DirCSIDL)
 {
   [NSException raise: NSInternalInconsistencyException
               format: @"Not implemented! Can't find directories in Win32."];    
+  return nil;
 }
 
 /**
  * Initialises resources required by utilities
  */
-void Win32_Utilities_init(void)
+void 
+Win32_Utilities_init(void)
 {
   /*
    * Initialise the COM sub-system for this application
    */
-  CoCreateInstance();
+  //CoCreateInstance();
 
   /*
    * Look for the libraries we need
@@ -200,20 +205,15 @@ void Win32_Utilities_init(void)
    */
 //  IShellMalloc, IShellFree
 //  SHGetFolder
-  ;
 }
 
 /**
  * Closes down and releases resources
  */
-void Win32_Utilities_fini(void)
+void 
+Win32_Utilities_fini(void)
 {
   /*
    * Release the pointers for Explorer Shell functions
    */
-  ;
 }
-
-#endif // defined(__WIN32)
-// EOF
-