diff --git a/server/trace.c b/server/trace.c
index 898998bcb20..c4572bd9efd 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -4112,12 +4112,14 @@ static const struct
     unsigned int value;
 } status_names[] =
 {
+    { "ABANDONED_WAIT_0",            STATUS_ABANDONED_WAIT_0 },
     { "ACCESS_DENIED",               STATUS_ACCESS_DENIED },
     { "ACCESS_VIOLATION",            STATUS_ACCESS_VIOLATION },
     { "ALERTED",                     STATUS_ALERTED },
     { "ALIAS_EXISTS",                STATUS_ALIAS_EXISTS },
     { "BAD_DEVICE_TYPE",             STATUS_BAD_DEVICE_TYPE },
     { "BAD_IMPERSONATION_LEVEL",     STATUS_BAD_IMPERSONATION_LEVEL },
+    { "BREAKPOINT",                  STATUS_BREAKPOINT },
     { "BUFFER_OVERFLOW",             STATUS_BUFFER_OVERFLOW },
     { "BUFFER_TOO_SMALL",            STATUS_BUFFER_TOO_SMALL },
     { "CANCELLED",                   STATUS_CANCELLED },
@@ -4135,6 +4137,7 @@ static const struct
     { "ERROR_INVALID_WINDOW_HANDLE", 0xc0010000 | ERROR_INVALID_WINDOW_HANDLE },
     { "FILE_IS_A_DIRECTORY",         STATUS_FILE_IS_A_DIRECTORY },
     { "FILE_LOCK_CONFLICT",          STATUS_FILE_LOCK_CONFLICT },
+    { "GENERIC_NOT_MAPPED",          STATUS_GENERIC_NOT_MAPPED },
     { "HANDLES_CLOSED",              STATUS_HANDLES_CLOSED },
     { "HANDLE_NOT_CLOSABLE",         STATUS_HANDLE_NOT_CLOSABLE },
     { "ILLEGAL_FUNCTION",            STATUS_ILLEGAL_FUNCTION },
@@ -4143,6 +4146,7 @@ static const struct
     { "INVALID_FILE_FOR_SECTION",    STATUS_INVALID_FILE_FOR_SECTION },
     { "INVALID_HANDLE",              STATUS_INVALID_HANDLE },
     { "INVALID_PARAMETER",           STATUS_INVALID_PARAMETER },
+    { "INVALID_SECURITY_DESCR",      STATUS_INVALID_SECURITY_DESCR },
     { "IO_TIMEOUT",                  STATUS_IO_TIMEOUT },
     { "KEY_DELETED",                 STATUS_KEY_DELETED },
     { "MAPPED_FILE_SIZE_ZERO",       STATUS_MAPPED_FILE_SIZE_ZERO },
@@ -4185,6 +4189,7 @@ static const struct
     { "TIMEOUT",                     STATUS_TIMEOUT },
     { "TOO_MANY_OPENED_FILES",       STATUS_TOO_MANY_OPENED_FILES },
     { "UNSUCCESSFUL",                STATUS_UNSUCCESSFUL },
+    { "USER_APC",                    STATUS_USER_APC },
     { "VOLUME_DISMOUNTED",           STATUS_VOLUME_DISMOUNTED },
     { "WAS_LOCKED",                  STATUS_WAS_LOCKED },
     { NULL, 0 }
diff --git a/tools/make_requests b/tools/make_requests
index 6ce17f5d5b1..d5364d920a1 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -239,14 +239,11 @@ sub GET_ERROR_NAMES()
     my %errors = ();
     foreach my $f (glob "server/*.c")
     {
+        next if $f eq "server/trace.c";
         open FILE, $f or die "Can't open $f";
         while (<FILE>)
         {
-            if (/set_error\s*\(\s*STATUS_(\w+)\s*\)/)
-            {
-                $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS";
-            }
-            elsif (/async_terminate_\w+\s*\(.*,\s*STATUS_(\w+)\s*\)/)
+            if (/STATUS_(\w+)/)
             {
                 $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS";
             }