diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
index 3de5e455b91..949abab8c95 100644
--- a/tools/winapi_check/win32/kernel32.api
+++ b/tools/winapi_check/win32/kernel32.api
@@ -94,7 +94,7 @@ LPMODULEENTRY
 LPOVERLAPPED
 LPOVERLAPPED_COMPLETION_ROUTINE
 LPPROCESSENTRY
-LPPROCESS_HEAP_ENTRY *
+LPPROCESS_HEAP_ENTRY
 LPPROCESS_INFORMATION
 LPPROGRESS_ROUTINE
 LPSECURITY_ATTRIBUTES
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index 37d1ad82b47..b05480ca543 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -255,13 +255,13 @@ foreach my $file ($options->files) {
 		    }
 
 		    $name2 = $name1;
-		    $name2 =~ s/([AW])$/16$1/;
+		    # $name2 =~ s/([AW])$/16$1/;
 
 		    $name3 = $name1;
 		    $name3 =~ s/16(([AW])?)$/$1/;
 
 		    $name4 = $name1;
-		    $name4 =~ s/^(.*?)(?:16)?$/\U$1\E/;
+		    # $name4 =~ s/^(.*?)(?:16)?$/\U$1\E/;
 
 		    $name5 = $name1;
 		    $name5 = s/^(.*?)16_fn(.*?)$/$116_$2/;
@@ -274,10 +274,10 @@ foreach my $file ($options->files) {
 		    }
 
 		    $name2 = $name1;
-		    $name2 =~ s/([AW])$/32$1/;
+		    # $name2 =~ s/([AW])$/32$1/;
 
 		    $name3 = $name1;
-		    $name3 =~ s/32(([AW])?)$/$1/;
+		    # $name3 =~ s/32(([AW])?)$/$1/;
 
 		    $name4 = $name1;
 		    $name4 =~ s/AW$//;
@@ -301,7 +301,7 @@ foreach my $file ($options->files) {
 		    $name5 = $name1;
 		}
 
-		if($name !~ /^SMapLS|SUnMapLS/ && $documentation !~ /($name|$name1|$name2|$name3|$name4|$name5)/) {
+		if($name !~ /^SMapLS|SUnMapLS/ && $documentation !~ /\b($name|$name1|$name2|$name3|$name4|$name5)\b/) {
 		    $output->write("$file: $name: \\\n");
 		    $output->write("$documentation\n");
 		}	       
diff --git a/tools/winapi_check/winapi_options.pm b/tools/winapi_check/winapi_options.pm
index 87f98dcb56a..3c326cb1771 100644
--- a/tools/winapi_check/winapi_options.pm
+++ b/tools/winapi_check/winapi_options.pm
@@ -59,7 +59,7 @@ my %options = (
     "calling-convention" => { default => 0, parent => "local", description => "calling convention checking" },
     "misplaced" => { default => 0, parent => "local", description => "check for misplaced functions" },
     "cross-call" => { default => 0, parent => "local", description => "check for cross calling functions" },
-    "documentation" => { default => 0, parent => "local", description => "check for documentation inconsistances\n" },
+    "documentation" => { default => 1, parent => "local", description => "check for documentation inconsistances\n" },
              
     "global" => { default => 1, description => "global checking" }, 
     "declared" => { default => 1, parent => "global", description => "declared checking" }, 
@@ -173,14 +173,14 @@ sub new {
 	$paths = join(" ",@$files);
     }
 
-    @$files = map {
+    @$files = sort(map {
 	s/^.\/(.*)$/$1/;
 	if(!/spec\.c$/) {
 	    $_;
 	} else {
 	    ();
 	}
-    } split(/\n/, `find $paths -name \\*.c`);
+    } split(/\n/, `find $paths -name \\*.c`));
 
     return $self;
 }