diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 39b096425b2..5836423aa27 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -780,7 +780,7 @@ DATETIME_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
   
   if(infoPtr->bCalDepressed == TRUE) {
     infoPtr->bCalDepressed = FALSE;
-    RedrawWindow(hwnd, &(infoPtr->calbutton), NULL, RDW_ERASE|RDW_INVALIDATE);
+    RedrawWindow(hwnd, &(infoPtr->calbutton), 0, RDW_ERASE|RDW_INVALIDATE);
   }
 
   return 0;
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 20b49b75f75..0d808fef0d4 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3012,7 +3012,7 @@ TREEVIEW_EditLabelA (HWND hwnd, WPARAM wParam, LPARAM lParam)
       if ( wineItem == NULL )
         {
         ERR("Cannot get valid TREEVIEW_ITEM for lParam\n");
-        return NULL;
+        return 0;
         }
 
       TRACE("Edit started for %s.\n", wineItem->pszText);
@@ -3069,7 +3069,7 @@ TREEVIEW_EditLabelA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
         TREEVIEW_EndEditLabelNow(hwnd, (WPARAM)TRUE, 0);
 
-        return NULL;
+        return 0;
       }
 
       SetWindowPos (
@@ -3091,7 +3091,7 @@ TREEVIEW_EditLabelA (HWND hwnd, WPARAM wParam, LPARAM lParam)
   ** return NULL since we cannot edit this.
   */
 
-  return NULL;
+    return 0;
   }
 
   return infoPtr->hwndEdit;
@@ -3214,7 +3214,7 @@ TREEVIEW_EndEditLabelNow (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
   /* update the window to eliminate fragments and the like */
   TreeView_GetItemRect(hwnd,infoPtr->editItem,&itemRect,FALSE);
-  RedrawWindow(hwnd,&itemRect,NULL,RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
+  RedrawWindow(hwnd,&itemRect,0,RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
 
   infoPtr->editItem = 0;
 
@@ -3355,7 +3355,7 @@ TREEVIEW_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
   {
     if ( infoPtr->editItem == 0 ) /* If we are not curently editing */
     {
-    if( SendMessageA(hwnd, TVM_EDITLABELA, 0, (LPARAM)iItem) == NULL)
+    if( SendMessageA(hwnd, TVM_EDITLABELA, 0, (LPARAM)iItem) == 0)
         return 0;
     }
   }
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index 7d1ce978f03..4fab7f59d75 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "winbase.h"
+#include "crtdll.h"
 #include "ldt.h"
 #include "heap.h"
 #include "commdlg.h"
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 43094467ae3..38b7e764678 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -15,6 +15,7 @@
 #include "ts_xutil.h"
 
 #include "winbase.h"
+#include "wine/winbase16.h"
 #include "winreg.h"
 
 #include "callback.h"
diff --git a/include/crtdll.h b/include/crtdll.h
index 6a600c050b5..4657bce701c 100644
--- a/include/crtdll.h
+++ b/include/crtdll.h
@@ -32,6 +32,7 @@ void   __cdecl CRTDLL_free( void *ptr );
 
 LPSTR  __cdecl CRTDLL__mbsinc( LPCSTR str );
 INT    __cdecl CRTDLL__mbslen( LPCSTR str );
+LPSTR  __cdecl CRTDLL__strlwr( LPSTR str );
 LPWSTR __cdecl CRTDLL__wcsdup( LPCWSTR str );
 INT    __cdecl CRTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 );
 INT    __cdecl CRTDLL__wcsicoll( LPCWSTR str1, LPCWSTR str2 );
diff --git a/msdos/ioports.c b/msdos/ioports.c
index 49fb7a0d314..24d01342aec 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -69,8 +69,6 @@ static char port_permissions[0x10000];
 #define IO_READ  1
 #define IO_WRITE 2
 
-#endif  /* DIRECT_IO_ACCESS */
-
 static void IO_FixCMOSCheckSum(void)
 {
 	WORD sum = 0;
@@ -83,6 +81,8 @@ static void IO_FixCMOSCheckSum(void)
 	TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]);
 }
 
+#endif  /* DIRECT_IO_ACCESS */
+
 static void set_timer_maxval(unsigned timer, unsigned maxval)
 {
     switch (timer) {
@@ -220,11 +220,8 @@ static inline void outl( DWORD value, WORD port )
     __asm__ __volatile__( "outl %0,%w1" : : "a" (value), "d" (port) );
 }
 
-#endif  /* DIRECT_IO_ACCESS */
-
 static void IO_port_init(void)
 {
-#ifdef DIRECT_IO_ACCESS
 	char temp[1024];
 
         do_direct_port_access = 0;
@@ -239,10 +236,10 @@ static void IO_port_init(void)
 					 temp, sizeof(temp) );
 		do_IO_port_init_read_or_write(temp, IO_WRITE);
 	}
-#endif  /* DIRECT_IO_ACCESS */
     IO_FixCMOSCheckSum();
 }
 
+#endif  /* DIRECT_IO_ACCESS */
 
 /**********************************************************************
  *	    IO_inport