diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 05ae45afe..cc42cc1d0 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-27  Johann Hanne  <jonnyh33@users.sourceforge.net>
+
+	* include/oaidl.h (GetTypeComp, GetTypeComp, IsMatchingType): Fix defintion.
+	* include/objidl.h (AddConnection, ReleaseConnection): Ditto.
+	* include/winbase.h (EnumResourceLanguagesA, EnumResourceLanguagesW,
+	EnumResourceNamesA, EnumResourceNamesW, EnumResourceTypesA,
+	EnumResourceTypesW): Ditto.
+	* include/winnt.h (_SYSTEM_POWER_CAPABILITIES): Ditto.
+
 2010-12-27  Seth Jackson  <sethj@users.sourceforge.net>
 
 	* include/basetsd.h: (INT8, UINT8, INT16, UINT16): Define.
diff --git a/winsup/w32api/include/oaidl.h b/winsup/w32api/include/oaidl.h
index b8a298571..218b9bcaf 100644
--- a/winsup/w32api/include/oaidl.h
+++ b/winsup/w32api/include/oaidl.h
@@ -627,7 +627,7 @@ DECLARE_INTERFACE_(ITypeLib,IUnknown)
 	STDMETHOD(GetTypeInfoType)(THIS_ UINT,TYPEKIND*) PURE;
 	STDMETHOD(GetTypeInfoOfGuid)(THIS_ REFGUID,ITypeInfo**) PURE;
 	STDMETHOD(GetLibAttr)(THIS_ TLIBATTR**) PURE;
-	STDMETHOD(GetTypeComp)(THIS_ ITypeComp*) PURE;
+	STDMETHOD(GetTypeComp)(THIS_ ITypeComp**) PURE;
 	STDMETHOD(GetDocumentation)(THIS_ INT,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
 	STDMETHOD(IsName)(THIS_ LPOLESTR,ULONG,BOOL*) PURE;
 	STDMETHOD(FindName)(THIS_ LPOLESTR,ULONG,ITypeInfo**,MEMBERID*,USHORT*) PURE;
@@ -646,7 +646,7 @@ DECLARE_INTERFACE_(ITypeLib2,ITypeLib)
 	STDMETHOD(GetTypeInfoType)(THIS_ UINT,TYPEKIND*) PURE;
 	STDMETHOD(GetTypeInfoOfGuid)(THIS_ REFGUID,ITypeInfo**) PURE;
 	STDMETHOD(GetLibAttr)(THIS_ TLIBATTR**) PURE;
-	STDMETHOD(GetTypeComp)(THIS_ ITypeComp*) PURE;
+	STDMETHOD(GetTypeComp)(THIS_ ITypeComp**) PURE;
 	STDMETHOD(GetDocumentation)(THIS_ INT,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
 	STDMETHOD(IsName)(THIS_ LPOLESTR,ULONG,BOOL*) PURE;
 	STDMETHOD(FindName)(THIS_ LPOLESTR,ULONG,ITypeInfo**,MEMBERID*,USHORT*) PURE;
@@ -729,7 +729,7 @@ DECLARE_INTERFACE_(IRecordInfo, IUnknown)
 	STDMETHOD(PutField )(THIS_ ULONG,PVOID,LPCOLESTR, VARIANT*) PURE;
 	STDMETHOD(PutFieldNoCopy)(THIS_ ULONG,PVOID,LPCOLESTR,VARIANT*) PURE;
 	STDMETHOD(GetFieldNames)(THIS_ ULONG*,BSTR*) PURE;
-	STDMETHOD_(BOOL,IsMatchingType)(THIS_ THIS) PURE;
+	STDMETHOD_(BOOL,IsMatchingType)(THIS_ IRecordInfo*) PURE;
 	STDMETHOD_(PVOID,RecordCreate)(THIS) PURE;
 	STDMETHOD(RecordCreateCopy)(THIS_ PVOID,PVOID*) PURE;
 	STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE;
diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h
index 8d7040467..fac7cb7f7 100644
--- a/winsup/w32api/include/objidl.h
+++ b/winsup/w32api/include/objidl.h
@@ -880,8 +880,8 @@ DECLARE_INTERFACE_(IExternalConnection,IUnknown)
 	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
 	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
 	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
+	STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE;
+	STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
 };
 #undef INTERFACE
 
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index a559e5d07..700057e8f 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1450,12 +1450,12 @@ WINBASEAPI BOOL WINAPI EncryptFileW(LPCWSTR);
 WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL);
 WINBASEAPI BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL);
 WINBASEAPI void WINAPI EnterCriticalSection(LPCRITICAL_SECTION);
-WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROC,LONG_PTR);
-WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROC,LONG_PTR);
-WINBASEAPI BOOL WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROC,LONG_PTR);
-WINBASEAPI BOOL WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROC,LONG_PTR);
-WINBASEAPI BOOL WINAPI EnumResourceTypesA(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
-WINBASEAPI BOOL WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG_PTR);
+WINBASEAPI BOOL WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG_PTR);
 WINBASEAPI BOOL WINAPI EqualPrefixSid(PSID,PSID);
 WINBASEAPI BOOL WINAPI EqualSid(PSID,PSID);
 WINBASEAPI DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL);
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 94fcd3231..9a36660bb 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -3750,7 +3750,8 @@ typedef struct _SYSTEM_POWER_CAPABILITIES {
 	BOOLEAN  ProcessorThrottle;
 	UCHAR  ProcessorMinThrottle;
 	UCHAR  ProcessorMaxThrottle;
-	UCHAR  spare2[4];
+	BOOLEAN  FastSystemS4;
+	UCHAR  spare2[3];
 	BOOLEAN  DiskSpinDown;
 	UCHAR  spare3[8];
 	BOOLEAN  SystemBatteriesPresent;