diff --git a/tools/winapi_check/win32/advapi32.api b/tools/winapi_check/win32/advapi32.api
new file mode 100644
index 00000000000..b2e2e48d8e0
--- /dev/null
+++ b/tools/winapi_check/win32/advapi32.api
@@ -0,0 +1,7 @@
+%long
+
+POLICY_INFORMATION_CLASS
+
+%long --extension
+
+LSA_HANDLE
\ No newline at end of file
diff --git a/tools/winapi_check/win32/comctl32.api b/tools/winapi_check/win32/comctl32.api
index 18ff86f42e2..9446a045082 100644
--- a/tools/winapi_check/win32/comctl32.api
+++ b/tools/winapi_check/win32/comctl32.api
@@ -4,4 +4,8 @@ COLORREF
 HBITMAP
 HDC
 HICON
-HWND
\ No newline at end of file
+HWND
+
+%ptr
+
+TRACKMOUSEEVENT *
\ No newline at end of file
diff --git a/tools/winapi_check/win32/odbc32.api b/tools/winapi_check/win32/odbc32.api
new file mode 100644
index 00000000000..d70f7743426
--- /dev/null
+++ b/tools/winapi_check/win32/odbc32.api
@@ -0,0 +1,31 @@
+%long
+
+SQLHANDLE
+SQLHDBC
+SQLHDESC
+SQLHENV
+SQLHSTMT
+SQLHWND
+SQLINTEGER
+SQLSMALLINT
+SQLUINTEGER
+SQLUSMALLINT
+
+%long --extension
+
+SQLRETURNTYPE
+
+%ptr
+
+SQLCHAR *
+SQLHANDLE *
+SQLHENV *
+SQLHSTMT *
+SQLINTEGER *
+SQLPOINTER
+SQLPOINTER *
+SQLSMALLINT *
+SQLUINTEGER *
+SQLUSMALLINT *
+
+
diff --git a/tools/winapi_check/winapi.pm b/tools/winapi_check/winapi.pm
index 851271469b3..7e588c15ec6 100644
--- a/tools/winapi_check/winapi.pm
+++ b/tools/winapi_check/winapi.pm
@@ -46,6 +46,7 @@ sub parse_api_file {
     my $module = shift;
 
     my $kind;
+    my $extension = 0;
     my $forbidden = 0;
 
     $$output->progress("$file");
@@ -60,10 +61,13 @@ sub parse_api_file {
 	if(s/^%(\S+)\s*//) {
 	    $kind = $1;
 	    $forbidden = 0;
+	    $extension = 0;
 
 	    $$allowed_kind{$kind} = 1;
 	    if(/^--forbidden/) {
 		$forbidden = 1;
+	    } elsif(/^--extension/) {
+		$extension = 1;
 	    }
 	} elsif(defined($kind)) {
 	    my $type = $_;