diff --git a/include/winerror.h b/include/winerror.h
index 41f3a725b6363af3ccda7f6d3dd317cab803db50..3c5979ca9d36e4e4431a5bce57c36df6bfa27bbf 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1897,8 +1897,5 @@ extern int WIN32_LastError;
 #define MEM_E_INVALID_LINK                                 0x80080010L
 #define MEM_E_INVALID_SIZE                                 0x80080011L
 
-/* Obtained from lcc-win32 include files */
-#define GDI_ERROR                                          0xFFFFFFFFL
-
 
 #endif  /* __WINE_WINERROR_H */
diff --git a/include/wingdi.h b/include/wingdi.h
index f14026487a7fc4325b9fc3853b1d6c0def6e51d3..f52088c16ca7015408867ad389ec47d02ff15325 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -2981,6 +2981,9 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE)
 #define	DISPLAY_DEVICE_MIRRORING_DRIVER		0x00000008
 #define	DISPLAY_DEVICE_VGA_COMPATIBLE		0x00000010
 
+#define GDI_ERROR                               (0xFFFFFFFFL)
+#define HGDI_ERROR                              ((HANDLE)0xFFFFFFFFL)
+
 #include "poppack.h"
 
 INT       WINAPI AbortDoc(HDC);