diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 3a1ef07c823..acae34d5adb 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -18,15 +18,6 @@
 #include "dplayx_messages.h"
 #include "dplayx_queue.h"
 
-/* Can't seem to solve unresolved reference even with import */
-#define HACK_TIMEGETTIME
-
-#if defined( HACK_TIMEGETTIME )
-static DWORD timeGetTime(void);
-#else
-#include "mmsystem.h"
-#endif
-
 /* FIXME: Need to create a crit section, store and use it */
 
 DEFAULT_DEBUG_CHANNEL(dplay);
@@ -105,7 +96,7 @@ void NS_SetRemoteComputerAsNameServer( LPVOID                    lpNSAddrHdr,
                                                               HEAP_ZERO_MEMORY, 
                                                               (LPWSTR)(lpMsg+1) );
 
-  lpCacheNode->dwTime = timeGetTime();
+  lpCacheNode->dwTime = GetTickCount();
 
   DPQ_INSERT(lpCache->first, lpCacheNode, next );
 
@@ -258,7 +249,7 @@ void NS_PruneSessionCache( LPVOID lpNSInfo )
   lpNSCache     lpCache = lpNSInfo;
   lpNSCacheData lpCacheEntry;
 
-  DWORD dwPresentTime = timeGetTime();
+  DWORD dwPresentTime = GetTickCount();
 #if defined( HACK_TIMEGETTIME )
   DWORD dwPruneTime   = dwPresentTime - 2; /* One iteration with safety */
 #else
@@ -328,11 +319,3 @@ void NS_ReplyToEnumSessionsRequest( LPVOID lpMsg,
  
 }
 
-#if defined( HACK_TIMEGETTIME )
-DWORD timeGetTime(void)
-{
-  static DWORD time = 0;
-  
-  return time++;
-}
-#endif
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 86227a5456b..fac02414ac3 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -478,7 +478,7 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen,
 /**************************************************************************
  *	RtlUpperString   (NTDLL.@)
  */
-void WINAPI RtlUpperString( STRING *dst, const STRING *src, BOOLEAN doalloc )
+void WINAPI RtlUpperString( STRING *dst, const STRING *src )
 {
     unsigned int i, len = min(src->Length, dst->MaximumLength);
 
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 4267c5cdd54..35bbc0f0ee7 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -23,6 +23,8 @@
  *   NE_MODULE.module32.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>