don't compile webkit against its headers

7 files changed, 331 insertions, 659 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 5d69ef1c4e..9a23f364c4 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -131,9 +131,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${XULRUNNER_LIBS}" = "" ]; then
 			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"linux.x86_64")
 		if [ "${CC}" = "" ]; then
@@ -163,9 +160,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${XULRUNNER_LIBS}" = "" ]; then
 			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"linux.ppc")
 		if [ "${CC}" = "" ]; then
@@ -195,9 +189,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"linux.ppc64")
 		if [ "${CC}" = "" ]; then
@@ -227,9 +218,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"solaris.x86")
 		if [ "${CC}" = "" ]; then
@@ -343,9 +331,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"linux.s390x")
 		if [ "${CC}" = "" ]; then
@@ -375,9 +360,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/local/cairo64/lib/pkgconfig"
 		fi
-		if [ "${WEBKIT_INCLUDES}" = "" ]; then
-			export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/"
-		fi
 		;;
 	"aix.ppc")
 		if [ "${CC}" = "" ]; then
@@ -509,14 +491,6 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]
 	fi
 fi
 
-if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then
-	echo "WebKit found, compiling webkit embedded browser support."
-	MAKE_WEBKIT=make_webkit
-else
-	echo "WebKit not found:"
-	echo "    *** WebKit embedding support will not be compiled."
-fi
-
 # Find AWT if available
 if [ -z "${AWT_LIB_PATH}" ]; then
 	if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then
@@ -545,5 +519,5 @@ fi
 if [ "x${1}" = "xclean" ]; then
 	${MAKE_TYPE} -f $MAKEFILE clean
 else
-	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
+	${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
 fi
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 9715d39c8b..60c7cd1b27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -91,8 +91,6 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
 	-DNO_nsDynamicFunctionLoad
 XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
 
-WEBKITCFLAGS = ${WEBKIT_INCLUDES}
-
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
 AWT_OBJECTS = swt_awt.o
@@ -281,13 +279,13 @@ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
 	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
 
 webkit.o: webkitgtk.c 
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
+	$(CC) $(CFLAGS) -c webkitgtk.c -o webkit.o
 
 webkit_structs.o: webkitgtk_structs.c 
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o
+	$(CC) $(CFLAGS) -c webkitgtk_structs.c -o webkit_structs.o
 	
 webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
-	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o
+	$(CC) $(CFLAGS) -c webkitgtk_stats.c -o webkit_stats.o
 
 #
 # GLX lib
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 42ea70db88..0fb36dff52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -38,12 +38,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC);
 /*
-	rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0);
+	rc = (jintLong)JSClassCreate(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const JSClassDefinition*))fp)((const JSClassDefinition*)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC);
@@ -58,12 +58,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC);
 /*
-	rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0);
+	rc = (jintLong)JSContextGetGlobalObject(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC);
@@ -80,12 +80,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC);
 	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
+	rc = (jintLong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectRef, JSStringRef, jint, JSValueRef *))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
@@ -102,12 +102,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC);
 /*
-	rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0);
+	rc = (jintLong)JSObjectGetPrivate(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSObjectRef))fp)((JSObjectRef)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC);
@@ -124,12 +124,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3);
+	rc = (jintLong)JSObjectGetProperty(arg0, arg1, arg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
@@ -148,12 +148,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3);
+	rc = (jintLong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, unsigned, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
@@ -170,12 +170,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC);
 /*
-	rc = (jintLong)JSObjectMake((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2);
+	rc = (jintLong)JSObjectMake(arg0, arg1, arg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSClassRef, void *))fp)((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC);
@@ -194,12 +194,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray)
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSObjectMakeArray((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3);
+	rc = (jintLong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, size_t, const struct OpaqueJSValue * const*, JSValueRef*))fp)((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3);
 		}
 	}
 fail:
@@ -217,12 +217,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC);
 /*
-	rc = (jintLong)JSObjectMakeFunctionWithCallback((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2);
+	rc = (jintLong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectCallAsFunctionCallback))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC);
@@ -238,12 +238,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC);
 	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 /*
-	JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5);
+	JSObjectSetProperty(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef, JSPropertyAttributes, JSValueRef *))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
@@ -261,12 +261,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSStringCreateWithUTF8CString((const char *)lparg0);
+	rc = (jintLong)JSStringCreateWithUTF8CString(lparg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
 		}
 	}
 fail:
@@ -283,12 +283,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC);
 /*
-	rc = (jintLong)JSStringGetLength((JSStringRef)arg0);
+	rc = (jintLong)JSStringGetLength(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC);
@@ -303,12 +303,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC);
 /*
-	rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0);
+	rc = (jintLong)JSStringGetMaximumUTF8CStringSize(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC);
@@ -325,12 +325,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSStringGetUTF8CString((JSStringRef)arg0, (char *)lparg1, (size_t)arg2);
+	rc = (jintLong)JSStringGetUTF8CString(arg0, lparg1, arg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef, char *, size_t))fp)((JSStringRef)arg0, (char *)lparg1, (size_t)arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong))fp)(arg0, lparg1, arg2);
 		}
 	}
 fail:
@@ -349,12 +349,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringIsEqualToUTF8CString_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jint)JSStringIsEqualToUTF8CString((JSStringRef)arg0, (const char *)lparg1);
+	rc = (jint)JSStringIsEqualToUTF8CString(arg0, lparg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(JSStringRef, const char *))fp)((JSStringRef)arg0, (const char *)lparg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -370,12 +370,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC);
 /*
-	JSStringRelease((JSStringRef)arg0);
+	JSStringRelease(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC);
@@ -389,12 +389,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC);
 /*
-	rc = (jint)JSValueGetType((JSContextRef)arg0, (JSValueRef)arg1);
+	rc = (jint)JSValueGetType(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC);
@@ -409,12 +409,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC);
 /*
-	rc = (jint)JSValueIsObjectOfClass((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2);
+	rc = (jint)JSValueIsObjectOfClass(arg0, arg1, arg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSClassRef))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC);
@@ -429,12 +429,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC);
 /*
-	rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1);
+	rc = (jintLong)JSValueMakeBoolean(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, bool))fp)((JSContextRef)arg0, (bool)arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC);
@@ -449,12 +449,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC);
 /*
-	rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1);
+	rc = (jintLong)JSValueMakeNumber(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, double))fp)((JSContextRef)arg0, (double)arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC);
@@ -469,12 +469,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC);
 /*
-	rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1);
+	rc = (jintLong)JSValueMakeString(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef))fp)((JSContextRef)arg0, (JSStringRef)arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC);
@@ -489,12 +489,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC);
 /*
-	rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0);
+	rc = (jintLong)JSValueMakeUndefined(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC);
@@ -509,12 +509,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueToBoolean)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToBoolean_FUNC);
 /*
-	rc = (jint)JSValueToBoolean((JSContextRef)arg0, (JSValueRef)arg1);
+	rc = (jint)JSValueToBoolean(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueToBoolean)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToBoolean_FUNC);
@@ -531,12 +531,12 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToNumber_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
-	rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
+	rc = (jdouble)JSValueToNumber(arg0, arg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber)
 		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -555,12 +555,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy)
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
+	rc = (jintLong)JSValueToStringCopy(arg0, arg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
@@ -626,12 +626,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate)
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
-	soup_auth_authenticate((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2);
+	soup_auth_authenticate(arg0, lparg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupAuth *, const char *, const char *))fp)((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -648,12 +648,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC);
 /*
-	rc = (jintLong)soup_auth_get_host((SoupAuth *)arg0);
+	rc = (jintLong)soup_auth_get_host(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC);
@@ -668,12 +668,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC);
 /*
-	rc = (jintLong)soup_auth_get_scheme_name((SoupAuth *)arg0);
+	rc = (jintLong)soup_auth_get_scheme_name(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC);
@@ -687,12 +687,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC);
 /*
-	soup_cookie_jar_add_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1);
+	soup_cookie_jar_add_cookie(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC);
@@ -706,12 +706,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC);
 /*
-	rc = (jintLong)soup_cookie_jar_all_cookies((SoupCookieJar *)arg0);
+	rc = (jintLong)soup_cookie_jar_all_cookies(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *))fp)((SoupCookieJar *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC);
@@ -725,12 +725,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC);
 /*
-	soup_cookie_jar_delete_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1);
+	soup_cookie_jar_delete_cookie(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC);
@@ -744,12 +744,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC);
 /*
-	rc = (jintLong)soup_cookie_jar_get_cookies((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2);
+	rc = (jintLong)soup_cookie_jar_get_cookies(arg0, arg1, arg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *, SoupURI *, jint))fp)((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC);
@@ -786,12 +786,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse)
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1parse_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)soup_cookie_parse((const char *)lparg0, (SoupURI *)arg1);
+	rc = (jintLong)soup_cookie_parse(lparg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, SoupURI *))fp)((const char *)lparg0, (SoupURI *)arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong))fp)(lparg0, arg1);
 		}
 	}
 fail:
@@ -807,12 +807,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC);
 /*
-	soup_message_body_append((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3);
+	soup_message_body_append(arg0, arg1, arg2, arg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupMessageBody *, SoupMemoryUse, gconstpointer, gsize))fp)((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3);
+			((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC);
@@ -825,12 +825,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC);
 /*
-	soup_message_body_flatten((SoupMessageBody *)arg0);
+	soup_message_body_flatten(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupMessageBody *))fp)((SoupMessageBody *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC);
@@ -844,12 +844,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC);
 /*
-	rc = (jintLong)soup_message_get_uri((SoupMessage *)arg0);
+	rc = (jintLong)soup_message_get_uri(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupMessage *))fp)((SoupMessage *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC);
@@ -867,12 +867,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append)
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
-	soup_message_headers_append((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2);
+	soup_message_headers_append(arg0, lparg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupMessageHeaders *, const char *, const char *))fp)((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2);
 		}
 	}
 fail:
@@ -888,12 +888,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC);
 /*
-	soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1);
+	soup_session_add_feature_by_type(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC);
@@ -906,12 +906,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC);
 /*
-	soup_session_feature_attach((SoupSessionFeature *)arg0, (SoupSession *)arg1);
+	soup_session_feature_attach(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC);
@@ -924,12 +924,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC);
 /*
-	soup_session_feature_detach((SoupSessionFeature *)arg0, (SoupSession *)arg1);
+	soup_session_feature_detach(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1);
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC);
@@ -943,12 +943,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC);
 /*
-	rc = (jintLong)soup_session_get_feature((SoupSession *)arg0, (GType)arg1);
+	rc = (jintLong)soup_session_get_feature(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC);
@@ -982,12 +982,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC);
 /*
-	soup_uri_free((SoupURI *)arg0);
+	soup_uri_free(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(SoupURI *))fp)((SoupURI *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC);
@@ -1003,12 +1003,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new)
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)soup_uri_new((const char *)lparg0);
+	rc = (jintLong)soup_uri_new(lparg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1025,12 +1025,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC);
 /*
-	rc = (jintLong)soup_uri_to_string((SoupURI *)arg0, arg1);
+	rc = (jintLong)soup_uri_to_string(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupURI *, jint))fp)((SoupURI *)arg0, arg1);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC);
@@ -1044,12 +1044,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC);
 /*
-	webkit_download_cancel((WebKitDownload *)arg0);
+	webkit_download_cancel(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC);
@@ -1063,12 +1063,12 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size)
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC);
 /*
-	rc = (jlong)webkit_download_get_current_size((WebKitDownload *)arg0);
+	rc = (jlong)webkit_download_get_current_size(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC);
@@ -1083,12 +1083,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC);
 /*
-	rc = (jint)webkit_download_get_status((WebKitDownload *)arg0);
+	rc = (jint)webkit_download_get_status(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC);
@@ -1103,12 +1103,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC);
 /*
-	rc = (jintLong)webkit_download_get_suggested_filename((WebKitDownload *)arg0);
+	rc = (jintLong)webkit_download_get_suggested_filename(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC);
@@ -1123,12 +1123,12 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size)
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC);
 /*
-	rc = (jlong)webkit_download_get_total_size((WebKitDownload *)arg0);
+	rc = (jlong)webkit_download_get_total_size(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC);
@@ -1143,12 +1143,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC);
 /*
-	rc = (jintLong)webkit_download_get_uri((WebKitDownload *)arg0);
+	rc = (jintLong)webkit_download_get_uri(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC);
@@ -1164,12 +1164,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	webkit_download_set_destination_uri((WebKitDownload *)arg0, (const gchar *)lparg1);
+	webkit_download_set_destination_uri(arg0, lparg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitDownload *, const gchar *))fp)((WebKitDownload *)arg0, (const gchar *)lparg1);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1265,12 +1265,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC);
 /*
-	rc = (jintLong)webkit_network_request_get_message((WebKitNetworkRequest *)arg0);
+	rc = (jintLong)webkit_network_request_get_message(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC);
@@ -1285,12 +1285,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC);
 /*
-	rc = (jintLong)webkit_network_request_get_uri((WebKitNetworkRequest *)arg0);
+	rc = (jintLong)webkit_network_request_get_uri(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC);
@@ -1307,12 +1307,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new)
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)webkit_network_request_new((const gchar *)lparg0);
+	rc = (jintLong)webkit_network_request_new(lparg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
 		}
 	}
 fail:
@@ -1349,12 +1349,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC);
 /*
-	rc = (jintLong)webkit_web_data_source_get_data((WebKitWebDataSource *)arg0);
+	rc = (jintLong)webkit_web_data_source_get_data(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC);
@@ -1369,12 +1369,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC);
 /*
-	rc = (jintLong)webkit_web_data_source_get_encoding((WebKitWebDataSource *)arg0);
+	rc = (jintLong)webkit_web_data_source_get_encoding(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC);
@@ -1389,12 +1389,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_data_source((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_data_source(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC);
@@ -1409,12 +1409,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_global_context((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_global_context(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC);
@@ -1429,12 +1429,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC);
 /*
-	rc = (jint)webkit_web_frame_get_load_status((WebKitWebFrame *)arg0);
+	rc = (jint)webkit_web_frame_get_load_status(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC);
@@ -1449,12 +1449,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_parent((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_parent(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC);
@@ -1469,12 +1469,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_title((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_title(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC);
@@ -1509,12 +1509,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_uri((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_uri(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC);
@@ -1529,12 +1529,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC);
 /*
-	rc = (jintLong)webkit_web_frame_get_web_view((WebKitWebFrame *)arg0);
+	rc = (jintLong)webkit_web_frame_get_web_view(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC);
@@ -1548,12 +1548,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC);
 /*
-	webkit_web_policy_decision_download((WebKitWebPolicyDecision *)arg0);
+	webkit_web_policy_decision_download(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC);
@@ -1566,12 +1566,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC);
 /*
-	webkit_web_policy_decision_ignore((WebKitWebPolicyDecision *)arg0);
+	webkit_web_policy_decision_ignore(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC);
@@ -1585,12 +1585,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC);
 /*
-	rc = (jint)webkit_web_view_can_go_back((WebKitWebView *)arg0);
+	rc = (jint)webkit_web_view_can_go_back(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC);
@@ -1605,12 +1605,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC);
 /*
-	rc = (jint)webkit_web_view_can_go_forward((WebKitWebView *)arg0);
+	rc = (jint)webkit_web_view_can_go_forward(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC);
@@ -1625,12 +1625,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC);
 /*
-	rc = (jint)webkit_web_view_can_show_mime_type((WebKitWebView *)arg0, (const gchar *)arg1);
+	rc = (jint)webkit_web_view_can_show_mime_type(arg0, arg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)arg1);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC);
@@ -1646,12 +1646,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script)
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	webkit_web_view_execute_script((WebKitWebView *)arg0, (const gchar *)lparg1);
+	webkit_web_view_execute_script(arg0, lparg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1667,12 +1667,12 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status)
 	jint rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC);
 /*
-	rc = (jint)webkit_web_view_get_load_status((WebKitWebView *)arg0);
+	rc = (jint)webkit_web_view_get_load_status(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC);
@@ -1687,12 +1687,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC);
 /*
-	rc = (jintLong)webkit_web_view_get_main_frame((WebKitWebView *)arg0);
+	rc = (jintLong)webkit_web_view_get_main_frame(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC);
@@ -1707,12 +1707,12 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress)
 	jdouble rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC);
 /*
-	rc = (jdouble)webkit_web_view_get_progress((WebKitWebView *)arg0);
+	rc = (jdouble)webkit_web_view_get_progress(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress)
 		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC);
@@ -1727,12 +1727,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC);
 /*
-	rc = (jintLong)webkit_web_view_get_settings((WebKitWebView *)arg0);
+	rc = (jintLong)webkit_web_view_get_settings(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC);
@@ -1747,12 +1747,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC);
 /*
-	rc = (jintLong)webkit_web_view_get_title((WebKitWebView *)arg0);
+	rc = (jintLong)webkit_web_view_get_title(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC);
@@ -1767,12 +1767,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri)
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC);
 /*
-	rc = (jintLong)webkit_web_view_get_uri((WebKitWebView *)arg0);
+	rc = (jintLong)webkit_web_view_get_uri(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC);
@@ -1787,12 +1787,12 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe
 	jintLong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC);
 /*
-	rc = (jintLong)webkit_web_view_get_window_features((WebKitWebView *)arg0);
+	rc = (jintLong)webkit_web_view_get_window_features(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC);
@@ -1806,12 +1806,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC);
 /*
-	webkit_web_view_go_back((WebKitWebView *)arg0);
+	webkit_web_view_go_back(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC);
@@ -1824,12 +1824,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC);
 /*
-	webkit_web_view_go_forward((WebKitWebView *)arg0);
+	webkit_web_view_go_forward(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC);
@@ -1850,12 +1850,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string)
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 /*
-	webkit_web_view_load_string((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4);
+	webkit_web_view_load_string(arg0, lparg1, lparg2, lparg3, lparg4);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *, const gchar *, const gchar *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4);
 		}
 	}
 fail:
@@ -1875,12 +1875,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri)
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	webkit_web_view_load_uri((WebKitWebView *)arg0, (const gchar *)lparg1);
+	webkit_web_view_load_uri(arg0, lparg1);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1);
+			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -1915,12 +1915,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC);
 /*
-	webkit_web_view_reload((WebKitWebView *)arg0);
+	webkit_web_view_reload(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC);
@@ -1933,12 +1933,12 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading)
 {
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC);
 /*
-	webkit_web_view_stop_loading((WebKitWebView *)arg0);
+	webkit_web_view_stop_loading(arg0);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0);
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
index c0b22e9b8e..5c8ba74562 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
@@ -18,24 +18,7 @@
 
 #include <dlfcn.h>
 #include <string.h>
-#include <JavaScriptCore/JSContextRef.h>
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSStringRef.h>
-#include <libsoup/soup-cookie.h>
-#include <libsoup/soup-cookie-jar.h>
-#include <libsoup/soup-session-feature.h>
-#include <libsoup/soup-uri.h>
-#include <webkit/webkitdownload.h>
-#include <webkit/webkitnetworkrequest.h>
-#include <webkit/webkitsoupauthdialog.h>
-#include <webkit/webkitversion.h>
-#include <webkit/webkitwebpolicydecision.h>
-#include <webkit/webkitwebsettings.h>
-#include <webkit/webkitwebview.h>
-
-#if WEBKIT_CHECK_VERSION(1,4,0)
-#include <webkit/webkitglobals.h>
-#endif
+#include "swt.h"
 
 #define WebKitGTK_LOAD_FUNCTION(var, name) \
 	static int initialized = 0; \
@@ -51,4 +34,45 @@
 		initialized = 1; \
 	}
 
+typedef struct {
+    int version;
+    int attributes;
+    const char* className;
+    void* parentClass;
+    const void* staticValues;
+    const void* staticFunctions;
+    void* initialize;
+    void* finalize;
+    void* hasProperty;
+    void* getProperty;
+    void* setProperty;
+    void* deleteProperty;
+    void* getPropertyNames;
+    void* callAsFunction;
+    void* callAsConstructor;
+    void* hasInstance;
+    void* convertToType;
+} JSClassDefinition;
+
+typedef struct {
+	char* name;
+	char* value;
+	char* domain;
+	char* path;
+	void* expires;
+	int secure;
+	int http_only;
+} SoupCookie;
+
+typedef struct {
+	void* parent;
+	const char* method;
+	int status_code;
+	char* reason_phrase;
+	void* request_body;
+	void* request_headers;
+	void* response_body;
+	void* response_headers;
+} SoupMessage;
+
 #endif /* INC_webkitgtk_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c
index a39af74a36..5324bd80a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2009, 2011 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
  * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
@@ -53,22 +53,22 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC
 {
 	if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject);
 	lpStruct->version = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.version);
-	lpStruct->attributes = (JSClassAttributes)(*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes);
+	lpStruct->attributes = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes);
 	lpStruct->className = (const char*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.className);
-	lpStruct->parentClass = (JSClassRef)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass);
-	lpStruct->staticValues = (const JSStaticValue*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues);
-	lpStruct->staticFunctions = (const JSStaticFunction*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions);
-	lpStruct->initialize = (JSObjectInitializeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize);
-	lpStruct->finalize = (JSObjectFinalizeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize);
-	lpStruct->hasProperty = (JSObjectHasPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty);
-	lpStruct->getProperty = (JSObjectGetPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty);
-	lpStruct->setProperty = (JSObjectSetPropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty);
-	lpStruct->deleteProperty = (JSObjectDeletePropertyCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty);
-	lpStruct->getPropertyNames = (JSObjectGetPropertyNamesCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames);
-	lpStruct->callAsFunction = (JSObjectCallAsFunctionCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction);
-	lpStruct->callAsConstructor = (JSObjectCallAsConstructorCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor);
-	lpStruct->hasInstance = (JSObjectHasInstanceCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance);
-	lpStruct->convertToType = (JSObjectConvertToTypeCallback)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType);
+	lpStruct->parentClass = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass);
+	lpStruct->staticValues = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues);
+	lpStruct->staticFunctions = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions);
+	lpStruct->initialize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize);
+	lpStruct->finalize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize);
+	lpStruct->hasProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty);
+	lpStruct->getProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty);
+	lpStruct->setProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty);
+	lpStruct->deleteProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty);
+	lpStruct->getPropertyNames = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames);
+	lpStruct->callAsFunction = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction);
+	lpStruct->callAsConstructor = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor);
+	lpStruct->hasInstance = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance);
+	lpStruct->convertToType = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType);
 	return lpStruct;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
index 391ce4a61c..1c81599802 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
@@ -17,37 +17,36 @@ package org.eclipse.swt.internal.webkit;
 
 public class JSClassDefinition {
     public int version;
-    /** @field cast=(JSClassAttributes) */
     public int attributes;
     /** @field cast=(const char*) */
     public int /*long*/ className;
-    /** @field cast=(JSClassRef) */
+    /** @field cast=(void*) */
     public int /*long*/ parentClass;
-    /** @field cast=(const JSStaticValue*) */
+    /** @field cast=(const void*) */
     public int /*long*/ staticValues;
-    /** @field cast=(const JSStaticFunction*) */
+    /** @field cast=(const void*) */
     public int /*long*/ staticFunctions;
-    /** @field cast=(JSObjectInitializeCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ initialize;
-    /** @field cast=(JSObjectFinalizeCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ finalize;
-    /** @field cast=(JSObjectHasPropertyCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ hasProperty;
-    /** @field cast=(JSObjectGetPropertyCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ getProperty;
-    /** @field cast=(JSObjectSetPropertyCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ setProperty;
-    /** @field cast=(JSObjectDeletePropertyCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ deleteProperty;
-    /** @field cast=(JSObjectGetPropertyNamesCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ getPropertyNames;
-    /** @field cast=(JSObjectCallAsFunctionCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ callAsFunction;
-    /** @field cast=(JSObjectCallAsConstructorCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ callAsConstructor;
-    /** @field cast=(JSObjectHasInstanceCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ hasInstance;
-    /** @field cast=(JSObjectConvertToTypeCallback) */
+    /** @field cast=(void*) */
     public int /*long*/ convertToType;
     
     public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index 6daf33a51f..0b5818d6b8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -79,10 +79,7 @@ protected static byte [] ascii (String name) {
 }
 
 
-/**
- * @method flags=dynamic
- * @param definition cast=(const JSClassDefinition*)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSClassCreate (int /*long*/ definition);
 public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
 	lock.lock();
@@ -93,10 +90,7 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx);
 public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
 	lock.lock();
@@ -107,14 +101,7 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param script cast=(JSStringRef)
- * @param thisObject cast=(JSObjectRef)
- * @param sourceURL cast=(JSStringRef)
- * @param exception cast=(JSValueRef *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception);
 public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception) {
 	lock.lock();
@@ -125,10 +112,7 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param object cast=(JSObjectRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object);
 public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
 	lock.lock();
@@ -139,13 +123,7 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param object cast=(JSObjectRef)
- * @param propertyName cast=(JSStringRef)
- * @param exception cast=(JSValueRef*)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception);
 public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception) {
 	lock.lock();
@@ -156,13 +134,7 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param object cast=(JSObjectRef)
- * @param propertyIndex cast=(unsigned)
- * @param exception cast=(JSValueRef*)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception);
 public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception) {
 	lock.lock();
@@ -173,12 +145,7 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param jsClass cast=(JSClassRef)
- * @param data cast=(void *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data);
 public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data) {
 	lock.lock();
@@ -189,13 +156,7 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param argumentCount cast=(size_t)
- * @param arguments cast=(const struct OpaqueJSValue * const*)
- * @param exception cast=(JSValueRef*)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception);
 public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception) {
 	lock.lock();
@@ -206,12 +167,7 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param name cast=(JSStringRef)
- * @param callAsFunction cast=(JSObjectCallAsFunctionCallback)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction);
 public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction) {
 	lock.lock();
@@ -222,15 +178,7 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param object cast=(JSObjectRef)
- * @param propertyName cast=(JSStringRef)
- * @param value cast=(JSValueRef)
- * @param attributes cast=(JSPropertyAttributes)
- * @param exception cast=(JSValueRef *)
- */
+/** @method flags=dynamic */
 public static final native void _JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception);
 public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception) {
 	lock.lock();
@@ -241,10 +189,7 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param string cast=(const char *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string);
 public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
 	lock.lock();
@@ -255,10 +200,7 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param string cast=(JSStringRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSStringGetLength (int /*long*/ string);
 public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
 	lock.lock();
@@ -269,10 +211,7 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param string cast=(JSStringRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string);
 public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string) {
 	lock.lock();
@@ -283,12 +222,7 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param string cast=(JSStringRef)
- * @param buffer cast=(char *)
- * @param bufferSize cast=(size_t)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize);
 public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize) {
 	lock.lock();
@@ -299,11 +233,7 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param a cast=(JSStringRef)
- * @param b cast=(const char *)
- */
+/** @method flags=dynamic */
 public static final native int _JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b);
 public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) {
 	lock.lock();
@@ -314,10 +244,7 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param string cast=(JSStringRef)
- */
+/** @method flags=dynamic */
 public static final native void _JSStringRelease (int /*long*/ string);
 public static final void JSStringRelease (int /*long*/ string) {
 	lock.lock();
@@ -328,11 +255,7 @@ public static final void JSStringRelease (int /*long*/ string) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param value cast=(JSValueRef)
- */
+/** @method flags=dynamic */
 public static final native int _JSValueGetType (int /*long*/ ctx, int /*long*/ value);
 public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
 	lock.lock();
@@ -343,12 +266,7 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param value cast=(JSValueRef)
- * @param jsClass cast=(JSClassRef)
- */
+/** @method flags=dynamic */
 public static final native int _JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass);
 public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass) {
 	lock.lock();
@@ -359,11 +277,7 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param bool cast=(bool)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSValueMakeBoolean (int /*long*/ ctx, int bool);
 public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) {
 	lock.lock();
@@ -374,11 +288,7 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param number cast=(double)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSValueMakeNumber (int /*long*/ ctx, double number);
 public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number) {
 	lock.lock();
@@ -389,11 +299,7 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param string cast=(JSStringRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSValueMakeString (int /*long*/ ctx, int /*long*/ string);
 public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string) {
 	lock.lock();
@@ -404,10 +310,7 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx);
 public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
 	lock.lock();
@@ -418,11 +321,7 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param value cast=(JSValueRef)
- */
+/** @method flags=dynamic */
 public static final native int _JSValueToBoolean (int /*long*/ ctx, int /*long*/ value);
 public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value) {
 	lock.lock();
@@ -433,12 +332,7 @@ public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param value cast=(JSValueRef)
- * @param exception cast=(JSValueRef*)
- */
+/** @method flags=dynamic */
 public static final native double _JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
 public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) {
 	lock.lock();
@@ -449,12 +343,7 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param ctx cast=(JSContextRef)
- * @param value cast=(JSValueRef)
- * @param exception cast=(JSValueRef*)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
 public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) {
 	lock.lock();
@@ -467,12 +356,7 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo
 
 /* --------------------- start libsoup natives --------------------- */
 
-/**
- * @method flags=dynamic
- * @param auth cast=(SoupAuth *)
- * @param username cast=(const char *)
- * @param password cast=(const char *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password);
 public static final void soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password) {
 	lock.lock();
@@ -483,10 +367,7 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param auth cast=(SoupAuth *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth);
 public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
 	lock.lock();
@@ -497,10 +378,7 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param auth cast=(SoupAuth *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth);
 public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
 	lock.lock();
@@ -511,11 +389,7 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param jar cast=(SoupCookieJar *)
- * @param cookie cast=(SoupCookie *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie);
 public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie) {
 	lock.lock();
@@ -526,10 +400,7 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param jar cast=(SoupCookieJar *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar);
 public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) {
 	lock.lock();
@@ -540,11 +411,7 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param jar cast=(SoupCookieJar *)
- * @param cookie cast=(SoupCookie *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie);
 public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie) {
 	lock.lock();
@@ -555,11 +422,7 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param jar cast=(SoupCookieJar *)
- * @param uri cast=(SoupURI *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http);
 public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http) {
 	lock.lock();
@@ -570,9 +433,7 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_cookie_jar_get_type ();
 public static final int /*long*/ soup_cookie_jar_get_type () {
 	lock.lock();
@@ -583,11 +444,7 @@ public static final int /*long*/ soup_cookie_jar_get_type () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param header cast=(const char *)
- * @param origin cast=(SoupURI *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_cookie_parse (byte[] header, int /*long*/ origin);
 public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ origin) {
 	lock.lock();
@@ -598,13 +455,7 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param body cast=(SoupMessageBody *)
- * @param use cast=(SoupMemoryUse)
- * @param data cast=(gconstpointer)
- * @param length cast=(gsize)
- */
+/** @method flags=dynamic */
 public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length);
 public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) {
 	lock.lock();
@@ -615,10 +466,7 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param body cast=(SoupMessageBody *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_message_body_flatten (int /*long*/ body);
 public static final void soup_message_body_flatten (int /*long*/ body) {
 	lock.lock();
@@ -629,10 +477,7 @@ public static final void soup_message_body_flatten (int /*long*/ body) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param msg cast=(SoupMessage *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg);
 public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
 	lock.lock();
@@ -643,12 +488,7 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param headers cast=(SoupMessageHeaders *)
- * @param name cast=(const char *)
- * @param value cast=(const char *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value);
 public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) {
 	lock.lock();
@@ -659,11 +499,7 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param session cast=(SoupSession *)
- * @param type cast=(GType)
- */
+/** @method flags=dynamic */
 public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type);
 public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) {
 	lock.lock();
@@ -674,11 +510,7 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param session cast=(SoupSession *)
- * @param feature_type cast=(GType)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type);
 public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) {
 	lock.lock();
@@ -689,11 +521,7 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session,
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param feature cast=(SoupSessionFeature *)
- * @param session cast=(SoupSession *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session);
 public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) {
 	lock.lock();
@@ -704,9 +532,7 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_session_get_type ();
 public static final int /*long*/ soup_session_get_type () {
 	lock.lock();
@@ -717,11 +543,7 @@ public static final int /*long*/ soup_session_get_type () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param feature cast=(SoupSessionFeature *)
- * @param session cast=(SoupSession *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session);
 public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) {
 	lock.lock();
@@ -732,10 +554,7 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param uri cast=(SoupURI *)
- */
+/** @method flags=dynamic */
 public static final native void _soup_uri_free (int /*long*/ uri);
 public static final void soup_uri_free (int /*long*/ uri) {
 	lock.lock();
@@ -746,10 +565,7 @@ public static final void soup_uri_free (int /*long*/ uri) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param uri_string cast=(const char *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_uri_new (byte[] uri_string);
 public static final int /*long*/ soup_uri_new (byte[] uri_string) {
 	lock.lock();
@@ -760,10 +576,7 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param uri cast=(SoupURI *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query);
 public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) {
 	lock.lock();
@@ -776,10 +589,7 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_
 
 /* --------------------- start WebKitGTK natives --------------------- */
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_download_cancel (int /*long*/ download);
 public static final void webkit_download_cancel (int /*long*/ download) {
 	lock.lock();
@@ -790,10 +600,7 @@ public static final void webkit_download_cancel (int /*long*/ download) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native long _webkit_download_get_current_size (int /*long*/ download);
 public static final long webkit_download_get_current_size (int /*long*/ download) {
 	lock.lock();
@@ -804,10 +611,7 @@ public static final long webkit_download_get_current_size (int /*long*/ download
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_download_get_status (int /*long*/ download);
 public static final int webkit_download_get_status (int /*long*/ download) {
 	lock.lock();
@@ -818,10 +622,7 @@ public static final int webkit_download_get_status (int /*long*/ download) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download);
 public static final int /*long*/ webkit_download_get_suggested_filename (int /*long*/ download) {
 	lock.lock();
@@ -832,10 +633,7 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native long _webkit_download_get_total_size (int /*long*/ download);
 public static final long webkit_download_get_total_size (int /*long*/ download) {
 	lock.lock();
@@ -846,10 +644,7 @@ public static final long webkit_download_get_total_size (int /*long*/ download)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download);
 public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) {
 	lock.lock();
@@ -860,11 +655,7 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param download cast=(WebKitDownload *)
- * @param destination_uri cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri);
 public static final void webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri) {
 	lock.lock();
@@ -875,9 +666,7 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_get_default_session ();
 public static final int /*long*/ webkit_get_default_session () {
 	lock.lock();
@@ -888,9 +677,7 @@ public static final int /*long*/ webkit_get_default_session () {
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int _webkit_major_version ();
 public static final int webkit_major_version () {
 	lock.lock();
@@ -901,9 +688,7 @@ public static final int webkit_major_version () {
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int _webkit_micro_version ();
 public static final int webkit_micro_version () {
 	lock.lock();
@@ -914,9 +699,7 @@ public static final int webkit_micro_version () {
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int _webkit_minor_version ();
 public static final int webkit_minor_version () {
 	lock.lock();
@@ -927,10 +710,7 @@ public static final int webkit_minor_version () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param request cast=(WebKitNetworkRequest *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request);
 public static final int /*long*/ webkit_network_request_get_message (int /*long*/ request) {
 	lock.lock();
@@ -941,10 +721,7 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long*
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param request cast=(WebKitNetworkRequest *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request);
 public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ request) {
 	lock.lock();
@@ -955,10 +732,7 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param uri cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_network_request_new (byte[] uri);
 public static final int /*long*/ webkit_network_request_new (byte[] uri) {
 	lock.lock();
@@ -969,9 +743,7 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
 public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
 	lock.lock();
@@ -982,10 +754,7 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param data_source cast=(WebKitWebDataSource *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source);
 public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ data_source) {
 	lock.lock();
@@ -996,10 +765,7 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param data_source cast=(WebKitWebDataSource *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source);
 public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long*/ data_source) {
 	lock.lock();
@@ -1010,10 +776,7 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ frame) {
 	lock.lock();
@@ -1024,10 +787,7 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_global_context (int /*long*/ frame) {
 	lock.lock();
@@ -1038,10 +798,7 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame);
 public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
 	lock.lock();
@@ -1052,10 +809,7 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame) {
 	lock.lock();
@@ -1066,10 +820,7 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) {
 	lock.lock();
@@ -1080,9 +831,7 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame)
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_type ();
 public static final int /*long*/ webkit_web_frame_get_type () {
 	lock.lock();
@@ -1093,10 +842,7 @@ public static final int /*long*/ webkit_web_frame_get_type () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
 	lock.lock();
@@ -1107,10 +853,7 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param frame cast=(WebKitWebFrame *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame);
 public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ frame) {
 	lock.lock();
@@ -1121,10 +864,7 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param decision cast=(WebKitWebPolicyDecision *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_policy_decision_download (int /*long*/ decision);
 public static final void webkit_web_policy_decision_download (int /*long*/ decision) {
 	lock.lock();
@@ -1135,10 +875,7 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param decision cast=(WebKitWebPolicyDecision *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision);
 public static final void webkit_web_policy_decision_ignore (int /*long*/ decision) {
 	lock.lock();
@@ -1149,10 +886,7 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view);
 public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
 	lock.lock();
@@ -1163,10 +897,7 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view);
 public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
 	lock.lock();
@@ -1177,11 +908,7 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- * @param mime_type cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type);
 public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type) {
 	lock.lock();
@@ -1192,11 +919,7 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- * @param script cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_execute_script (int /*long*/ web_view, byte[] script);
 public static final void webkit_web_view_execute_script (int /*long*/ web_view, byte[] script) {
 	lock.lock();
@@ -1207,10 +930,7 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view,
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view);
 public static final int webkit_web_view_get_load_status (int /*long*/ web_view) {
 	lock.lock();
@@ -1221,10 +941,7 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ web_view) {
 	lock.lock();
@@ -1235,10 +952,7 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native double _webkit_web_view_get_progress (int /*long*/ web_view);
 public static final double webkit_web_view_get_progress (int /*long*/ web_view) {
 	lock.lock();
@@ -1249,10 +963,7 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_view) {
 	lock.lock();
@@ -1263,10 +974,7 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_view) {
 	lock.lock();
@@ -1277,10 +985,7 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) {
 	lock.lock();
@@ -1291,10 +996,7 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view);
 public static final int /*long*/ webkit_web_view_get_window_features (int /*long*/ web_view) {
 	lock.lock();
@@ -1305,10 +1007,7 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_go_back (int /*long*/ web_view);
 public static final void webkit_web_view_go_back (int /*long*/ web_view) {
 	lock.lock();
@@ -1319,10 +1018,7 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_go_forward (int /*long*/ web_view);
 public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
 	lock.lock();
@@ -1333,14 +1029,7 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- * @param content cast=(const gchar *)
- * @param mime_type cast=(const gchar *)
- * @param encoding cast=(const gchar *)
- * @param base_uri cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri);
 public static final void webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) {
 	lock.lock();
@@ -1351,11 +1040,7 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- * @param uri cast=(const gchar *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri);
 public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri) {
 	lock.lock();
@@ -1366,9 +1051,7 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
 	}
 }
 
-/**
- * @method flags=dynamic
- */
+/** @method flags=dynamic */
 public static final native int /*long*/ _webkit_web_view_new ();
 public static final int /*long*/ webkit_web_view_new () {
 	lock.lock();
@@ -1379,10 +1062,7 @@ public static final int /*long*/ webkit_web_view_new () {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_reload (int /*long*/ web_view);
 public static final void webkit_web_view_reload (int /*long*/ web_view) {
 	lock.lock();
@@ -1393,10 +1073,7 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
 	}
 }
 
-/**
- * @method flags=dynamic
- * @param web_view cast=(WebKitWebView *)
- */
+/** @method flags=dynamic */
 public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view);
 public static final void webkit_web_view_stop_loading (int /*long*/ web_view) {
 	lock.lock();