diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in
index 117534f975d..abd893db71f 100644
--- a/dlls/wineandroid.drv/Makefile.in
+++ b/dlls/wineandroid.drv/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wineandroid.drv
 UNIXLIB   = wineandroid.so
 IMPORTS   = ntoskrnl
diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c
index b7292b5faf1..e50336c779c 100644
--- a/dlls/wineandroid.drv/device.c
+++ b/dlls/wineandroid.drv/device.c
@@ -675,7 +675,7 @@ static NTSTATUS android_error_to_status( int err )
     }
 }
 
-static int status_to_android_error( NTSTATUS status )
+static int status_to_android_error( unsigned int status )
 {
     switch (status)
     {
@@ -1147,7 +1147,7 @@ NTSTATUS android_dispatch_ioctl( void *arg )
     }
     else
     {
-        FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
+        FIXME( "ioctl %x not supported\n", (int)irpsp->Parameters.DeviceIoControl.IoControlCode );
         irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;
     }
     return STATUS_SUCCESS;
diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c
index b10491a22d8..ca3583b574f 100644
--- a/dlls/wineandroid.drv/dllmain.c
+++ b/dlls/wineandroid.drv/dllmain.c
@@ -74,14 +74,14 @@ static DWORD CALLBACK device_thread( void *arg )
     NTSTATUS status;
     DWORD ret;
 
-    TRACE( "starting process %x\n", GetCurrentProcessId() );
+    TRACE( "starting process %lx\n", GetCurrentProcessId() );
 
     if (ANDROID_CALL( java_init, NULL )) return 0;  /* not running under Java */
 
     RtlInitUnicodeString( &nameW, driver_nameW );
     if ((status = IoCreateDriver( &nameW, init_android_driver )))
     {
-        FIXME( "failed to create driver error %x\n", status );
+        FIXME( "failed to create driver error %lx\n", status );
         return status;
     }
 
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index 4308725dcee..acf6b9abbbe 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -264,7 +264,7 @@ static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev )
  */
 LONG ANDROID_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid )
 {
-    FIXME( "(%p,%s,%p,0x%08x,%p)\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid );
+    FIXME( "(%p,%s,%p,0x%08x,%p)\n", displays, debugstr_w(primary_name), hwnd, (int)flags, lpvoid );
     return DISP_CHANGE_SUCCESSFUL;
 }
 
@@ -320,8 +320,8 @@ BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODE
     devmode->dmFields = DM_POSITION | DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT |
                         DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY;
     TRACE( "current mode -- %dx%d %d bpp @%d Hz\n",
-           devmode->dmPelsWidth, devmode->dmPelsHeight,
-           devmode->dmBitsPerPel, devmode->dmDisplayFrequency );
+           (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight,
+           (int)devmode->dmBitsPerPel, (int)devmode->dmDisplayFrequency );
     return TRUE;
 }
 
diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c
index 82035cc14dd..7c55c481353 100644
--- a/dlls/wineandroid.drv/keyboard.c
+++ b/dlls/wineandroid.drv/keyboard.c
@@ -812,7 +812,7 @@ INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size )
         if (len) buffer[--len] = 0;
     }
 
-    TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer ));
+    TRACE( "lparam 0x%08x -> %s\n", (int)lparam, debugstr_w( buffer ));
     return len;
 }
 
diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 9406236a405..a339c20ceda 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -490,16 +490,16 @@ static int process_events( DWORD mask )
 
                 if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN|MOUSEEVENTF_MIDDLEDOWN))
                     TRACE( "BUTTONDOWN pos %d,%d hwnd %p flags %x\n",
-                           event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy,
-                           event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags );
+                           (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy,
+                           event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags );
                 else if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTUP|MOUSEEVENTF_RIGHTUP|MOUSEEVENTF_MIDDLEUP))
                     TRACE( "BUTTONUP pos %d,%d hwnd %p flags %x\n",
-                           event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy,
-                           event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags );
+                           (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy,
+                           event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags );
                 else
                     TRACE( "MOUSEMOVE pos %d,%d hwnd %p flags %x\n",
-                           event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy,
-                           event->data.motion.hwnd, event->data.motion.input.u.mi.dwFlags );
+                           (int)event->data.motion.input.u.mi.dx, (int)event->data.motion.input.u.mi.dy,
+                           event->data.motion.hwnd, (int)event->data.motion.input.u.mi.dwFlags );
                 if (!capture && (event->data.motion.input.u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE))
                 {
                     RECT rect;
@@ -735,8 +735,8 @@ static void android_surface_flush( struct window_surface *window_surface )
 
     TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n",
            surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ),
-           wine_dbgstr_rect( &rect ), surface->bits, surface->alpha, surface->color_key,
-           surface->region_data ? surface->region_data->rdh.nCount : 0 );
+           wine_dbgstr_rect( &rect ), surface->bits, surface->alpha, (int)surface->color_key,
+           surface->region_data ? (int)surface->region_data->rdh.nCount : 0 );
 
     rc.left   = rect.left;
     rc.top    = rect.top;
@@ -1302,7 +1302,7 @@ BOOL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags,
 
     TRACE( "win %p window %s client %s style %08x flags %08x\n",
            hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect),
-           NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags );
+           (int)NtUserGetWindowLongW( hwnd, GWL_STYLE ), swp_flags );
 
     if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return TRUE;
 
@@ -1351,7 +1351,7 @@ void ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags,
                                struct window_surface *surface )
 {
     struct android_win_data *data;
-    DWORD new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE );
+    UINT new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE );
     HWND owner = 0;
 
     if (!(data = get_win_data( hwnd ))) return;
@@ -1665,7 +1665,7 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
         }
         return 0;
     default:
-        FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );
+        FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp );
         return 0;
     }
 }