diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index fac9ad63a4a..92b3819c85f 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -32,12 +32,12 @@ struct request_max_size
     int pad[16];
 };
 
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
-typedef void *obj_handle_t;
-typedef void *user_handle_t;
-#else
+#ifdef WINE_NO_STRICT
 typedef int obj_handle_t;
 typedef unsigned int user_handle_t;
+#else
+typedef void *obj_handle_t;
+typedef void *user_handle_t;
 #endif
 
 typedef unsigned short atom_t;
diff --git a/include/winnt.h b/include/winnt.h
index 63f0e6de846..02ac25b7907 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -561,14 +561,14 @@ typedef DWORD		EXECUTION_STATE;
  * we're ready we'll remove the '!defined(__WINE__)' (the equivalent
  * of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
  */
-#if defined(__WINE__) && defined(WINE_NO_STRICT)
+#ifdef WINE_NO_STRICT
 typedef UINT HANDLE;
 #else
 typedef void *HANDLE;
 #endif
 typedef HANDLE *PHANDLE, *LPHANDLE;
 
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
+#if (defined(STRICT) || defined(__WINE__)) && !defined(WINE_NO_STRICT)
 #define DECLARE_HANDLE(a) \
     typedef struct a##__ { int unused; } *a; \
     typedef a *P##a
diff --git a/server/protocol.def b/server/protocol.def
index d454ca412b1..325d62c4fda 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -48,12 +48,12 @@ struct request_max_size
     int pad[16]; /* the max request size is 16 ints */
 };
 
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
-typedef void *obj_handle_t;
-typedef void *user_handle_t;
-#else
+#ifdef WINE_NO_STRICT
 typedef int obj_handle_t;
 typedef unsigned int user_handle_t;
+#else
+typedef void *obj_handle_t;
+typedef void *user_handle_t;
 #endif
 
 typedef unsigned short atom_t;