diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 1aa40e27f6e..5b77d417631 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -2720,7 +2720,7 @@ BOOL WINAPI CommConfigDialogW(
  *  If successful, lpCommConfig contains the comm port configuration.
  */
 BOOL WINAPI GetCommConfig(
-	HFILE hFile,
+	HANDLE hFile,
 	LPCOMMCONFIG lpCommConfig
 ) {
     BOOL r;
@@ -2746,7 +2746,7 @@ BOOL WINAPI GetCommConfig(
  *
  */
 BOOL WINAPI SetCommConfig(
-	HFILE hFile,
+	HANDLE hFile,
 	LPCOMMCONFIG lpCommConfig
 ) {
     BOOL r;
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index e522965d32f..cdc38787676 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -17,12 +17,6 @@
 #include "winbase.h"
 #include "debugtools.h"
 
-#ifndef _WINDOWS
-#define _WINDOWS
-#endif
-
-typedef char* 		GUID;  /* This definition is in sqltypes.h, but if _WINDOWS is defined, this is skipped. */
-
 #include "sql.h"
 #include "sqltypes.h"
 #include "sqlext.h"
diff --git a/include/windef.h b/include/windef.h
index eb516cca029..192eff93e9d 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -274,7 +274,7 @@ DECLARE_HANDLE(HDROP);
 DECLARE_HANDLE(HDRVR);
 DECLARE_HANDLE(HDWP);
 DECLARE_HANDLE(HENHMETAFILE);
-DECLARE_HANDLE(HFILE);
+typedef int HFILE;
 DECLARE_HANDLE(HFONT);
 DECLARE_HANDLE(HICON);
 DECLARE_HANDLE(HINSTANCE);