diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 349d9a49d..395d3623d 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/oaidl.h: Include windows.h and ole2.h,
+	unless COM_NO_WINDOWS_H.
+
+	[mingw-Bugs-1742130]
+	* include/oaidl.h (struct tagVARIANT): Add union members
+	LONGLONG  * pllVal and ULONGLONG * pullVal.
+
 2007-07-01  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/ws2tcpip.h (s6_addr32): Correct definition.
diff --git a/winsup/w32api/include/oaidl.h b/winsup/w32api/include/oaidl.h
index 8aecd1bde..b8a298571 100644
--- a/winsup/w32api/include/oaidl.h
+++ b/winsup/w32api/include/oaidl.h
@@ -1,9 +1,14 @@
 #ifndef _OAIDL_H
 #define _OAIDL_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
+#ifndef COM_NO_WINDOWS_H
+#include <windows.h>
+#include <ole2.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -213,6 +218,7 @@ typedef struct tagVARIANT {
 		unsigned char *pbVal;
 		short *piVal;
 		long *plVal;
+		LONGLONG  * pllVal;
 		float *pfltVal;
 		double *pdblVal;
 		VARIANT_BOOL *pboolVal;
@@ -236,6 +242,7 @@ typedef struct tagVARIANT {
 		CHAR  *pcVal;
 		USHORT  *puiVal;
 		ULONG  *pulVal;
+		ULONGLONG * pullVal;
 		INT  *pintVal;
 		UINT  *puintVal;
 		_ANONYMOUS_STRUCT struct {