Index: Include/OAIdl.ab
===================================================================
--- Include/OAIdl.ab	(revision 149)
+++ Include/OAIdl.ab	(revision 150)
@@ -21,8 +21,8 @@
 Const VARIANT_FALSE = (0 As VARIANT_BOOL) ' WTypes.ab
 TypeDef SCODE = Long
-Class CY ' WTypes.ab
+Type /*Class*/ CY ' WTypes.ab
 Public
 	int64 As Int64
-
+/*
 	Function Lo() As DWord
 		Return GetDWord(VarPtr(int64))
@@ -40,13 +40,14 @@
 		SetDWord(VarPtr(int64) + SizeOf (DWord, lo As DWord))
 	End Sub
-End Class
-
-Class DECIMAL ' WTypes.ab
-Public
+*/
+End Type'Class
+
+Type /*Class*/ DECIMAL ' WTypes.ab
+'Public
 	wReserved As Word
 	signscale As Word
 	Hi32 As DWord
 	Lo64 As QWord
-
+/*
 	Function scale() As Byte
 		Return GetByte(VarPtr(signscale))
@@ -73,5 +74,4 @@
 	End Sub
 
-
 	Function Mid32() As DWord
 		Return GetDWord(VarPtr(Lo64) As *DWord)
@@ -81,5 +81,6 @@
 		SetDWord(VarPtr(Lo64) As *DWord + SizeOf (DWord), m)
 	End Sub
-End Class
+*/
+End Type ' Class
 
 TypeDef DATE = Double ' WTypes.ab
@@ -214,5 +215,5 @@
 End Enum
 
-Class VARIANT
+Type /*Class*/ VARIANT
 Public
 	vt As VARTYPE
@@ -221,5 +222,5 @@
 	wReserved3 As Word
 	val As QWord
-
+/*
 	Function llVal() As Int64
 		Return val As Int64
@@ -457,13 +458,13 @@
 		val = v As ULONG_PTR
 	End Sub
-/*
-	Function byref() As VoidPtr
-		Return val As ULONG_PTR As VoidPtr
-	End Function
-
-	Sub byref(v As VoidPtr)
-		val = v As ULONG_PTR
-	End Sub
-*/
+
+'	Function byref() As VoidPtr
+'		Return val As ULONG_PTR As VoidPtr
+'	End Function
+
+'	Sub byref(v As VoidPtr)
+'		val = v As ULONG_PTR
+'	End Sub
+
 	Function cVal() As Char
 		Return val As Byte As Char
@@ -597,5 +598,6 @@
 		p[0] = v
 	End Sub
-End Class
+*/
+End Type 'Class
 
 TypeDef LPVARIANT = *VARIANT
@@ -625,6 +627,6 @@
 End Enum
 
-Class TYPEDESC
-Private
+Type /*Class*/ TYPEDESC
+' Private
 	p As VoidPtr
 '	/* [switch_is][switch_type] */ Union
@@ -634,7 +636,7 @@
 '		/* [default] */  /* Empty union arm */
 '	End Union
-Public
+'Public
 	vt As VARTYPE
-
+/*
 	Function lptdesc() As *TYPEDESC
 		Return p
@@ -660,5 +662,6 @@
 		p = prd
 	End Sub
-End Class
+*/
+End Type 'Class
 
 Type ARRAYDESC
@@ -704,9 +707,9 @@
 Const IDLFLAG_FRETVAL = PARAMFLAG_FRETVAL
 
-Class ELEMDESC
-Public
+Type /*Class*/ ELEMDESC
+'Public
 	tdesc As TYPEDESC
 	idldesc As IDLDESC
-
+/*
 	Function paramdesc() As PARAMDESC
 		Dim p As *PARAMDESC
@@ -720,5 +723,6 @@
 		p[0] = pd
 	End Sub
-End Class
+*/
+End Type 'Class
 
 Type TYPEATTR
@@ -828,6 +832,6 @@
 Const IMPLTYPEFLAG_FDEFAULTVTABLE = &h8
 
-Class VARDESC
-Public
+Type /*Class*/ VARDESC
+'Public
 	memid As MEMBERID
 	lpstrSchema As LPOLESTR
@@ -839,5 +843,5 @@
 	wVarFlags As Word
 	varkind As VARKIND
-
+/*
 	Function oInst() As DWord
 		Return lpvarValue As ULONG_PTR As DWord
@@ -847,5 +851,6 @@
 		lpvarValue = o As ULONG_PTR As *VARIANT
 	End Sub
-End Class
+*/
+End Type 'Class
 
 TypeDef LPVARDESC = VARDESC
Index: Include/OleAuto.ab
===================================================================
--- Include/OleAuto.ab	(revision 149)
+++ Include/OleAuto.ab	(revision 150)
@@ -514,5 +514,5 @@
 Declare Function VarRound Lib "oleaut32" (ByRef in As VARIANT, cDecimals As Long, ByRef result As VARIANT) As HRESULT
 
-Declare Function VarCmp Lib "oleaut32" (ByRef lhs As VARIANT, ByRef rhs As VARIANT, lcid As LCID, ByRef dwFlags As DWord) As HRESULT
+Declare Function VarCmp Lib "oleaut32" (ByRef lhs As VARIANT, ByRef rhs As VARIANT, lcid As LCID, dwFlags As DWord) As HRESULT
 
 Declare Function VarDecAdd Lib "oleaut32" (ByRef lhs As DECIMAL, ByRef rhs As DECIMAL, ByRef result As DECIMAL) As HRESULT
Index: Include/api_winsock2.sbp
===================================================================
--- Include/api_winsock2.sbp	(revision 149)
+++ Include/api_winsock2.sbp	(revision 150)
@@ -109,6 +109,6 @@
 
 
-Class hostent
-Public
+Type /*Class*/ hostent
+'Public
 	h_name As *Byte
 	h_aliases As **Byte
@@ -116,5 +116,5 @@
 	h_lengt As Integer
 	h_addr_list As **Byte
-
+/*
 	Function h_addr() As *Byte
 		Return h_addr_list[0]
@@ -124,5 +124,6 @@
 		h_addr_list[0] = i
 	End Sub
-End Class
+*/
+End /*Class*/
 
 Type netent
@@ -220,6 +221,6 @@
 #define s_addr
 ' Internet address (old style... should be updated)
-Class in_addr
-Public
+Type /*Class*/ in_addr
+'Public
 /*
 	Union S_un
@@ -238,5 +239,5 @@
 */
 	s_addr As DWord
-
+/*
 	Function s_host() As Byte
 		Return GetByte(VarPtr(s_addr) + 1)
@@ -278,5 +279,6 @@
 		Return SetByte(VarPtr(s_addr) + 2, l)
 	End Sub
-End Class
+*/
+End Type 'Class
 #endif
 
@@ -835,6 +837,6 @@
 End Type
 
-Class WSACOMPLETION
-Public
+Type /*Class*/ WSACOMPLETION
+'Public
 	Type_ As WSACOMPLETIONTYPE
 /*
@@ -847,5 +849,5 @@
 */
 	Port As _System_WinSock_WSACOMPLETION_PORT
-
+/*
 	Function WindowMessage() As _System_WinSock_WSACOMPLETION_WINDOWMESSAGE
 		Dim p As *_System_WinSock_WSACOMPLETION_WINDOWMESSAGE
@@ -896,5 +898,5 @@
 	End Sub
 */
-End Class
+End Type 'Class
 
 TypeDef PWSACOMPLETION = *WSACOMPLETION
Index: Include/basic.sbp
===================================================================
--- Include/basic.sbp	(revision 149)
+++ Include/basic.sbp	(revision 150)
@@ -65,4 +65,12 @@
 #endif
 TypeDef DWORD_PTR = ULONG_PTR
+
+Sub SetPointer(pPtr As VoidPtr, p As VoidPtr)
+	Set_LONG_PTR(pPtr, p As LONG_PTR)
+End Sub
+
+Function GetPointer(pPtr As VoidPtr) As VoidPtr
+	GetPointer = Get_LONG_PTR(pPtr) As VoidPtr
+End Function
 
 Sub Set_LONG_PTR(pPtr As VoidPtr, lpData As LONG_PTR)
Index: Include/ole2.ab
===================================================================
--- Include/ole2.ab	(revision 149)
+++ Include/ole2.ab	(revision 150)
@@ -141,6 +141,6 @@
 /* Object creation APIs */
 
-Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord,
-                /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal pClientSite As *IOleClientSite,
+Declare Function OleCreate Lib "ole32.dll" (/*IN*/ ByRef rclsid As CLSID, /*IN*/ ByRef riid As IID, /*IN*/ ByVal renderopt As DWord, _
+                /*IN*/ ByVal pFormatEtc As *FORMATETC, /*IN*/ ByVal pClientSite As *IOleClientSite, _
                 /*IN*/ ByVal pStg As *IStorage, /*OUT*/ ByRef ppvObj As Any) As HRESULT