diff --git a/bld/trap/common/nlm/nlmstrt.c b/bld/trap/common/nlm/nlmstrt.c
index 0657ee613b..0a8ef0db18 100644
--- a/bld/trap/common/nlm/nlmstrt.c
+++ b/bld/trap/common/nlm/nlmstrt.c
@@ -32,6 +32,7 @@
 
 #include "miniproc.h"
 #include "debugme.h"
+#include "brkptcpu.h"
 #include <string.h>
 #undef POP_UP_SCREEN
 #define ConsolePrintf _
@@ -594,3 +595,18 @@ void WriteStdErr( char *str, int len )
         ++str;
     }
 }
+
+extern void __STK( int size );
+extern void __CHK( int size );
+#pragma off (check_stack);
+void __declspec(naked) __CHK( int size )
+{
+    (void)size;
+    __asm {
+        push eax
+        mov eax,8[esp]
+        call __STK
+        pop eax
+        ret 4
+    }
+}
diff --git a/bld/trap/lcl/dos/dosx/ads/c/adsacc.c b/bld/trap/lcl/dos/dosx/ads/c/adsacc.c
index befb1edf20..2d92e7523a 100644
--- a/bld/trap/lcl/dos/dosx/ads/c/adsacc.c
+++ b/bld/trap/lcl/dos/dosx/ads/c/adsacc.c
@@ -1028,7 +1028,3 @@ void GotInt3( void )
     _DBG0(( "Got Int 3!!!" ));
 }
 #endif
-
-extern void StackCheck( void );
-#pragma aux StackCheck "__STK";
-void StackCheck( void ) {}
diff --git a/bld/trap/lcl/os2/c/pmdbg.c b/bld/trap/lcl/os2/c/pmdbg.c
index 3e1b9d6532..f3e182b36f 100644
--- a/bld/trap/lcl/os2/c/pmdbg.c
+++ b/bld/trap/lcl/os2/c/pmdbg.c
@@ -279,7 +279,3 @@ MRESULT EXPENTRY MyWindowProc( HWND hwnd, USHORT msg, MPARAM mp1, MPARAM mp2 )
     return FALSE;
 }
 /**********************  End of window procedure  ***********************/
-
-extern void StackCheck( void );
-#pragma aux StackCheck "__STK";
-void StackCheck( void ) {}
diff --git a/bld/trap/lcl/os2/test/pmdbg.c b/bld/trap/lcl/os2/test/pmdbg.c
index 4ac52a3dc4..cc7cf6b0fd 100644
--- a/bld/trap/lcl/os2/test/pmdbg.c
+++ b/bld/trap/lcl/os2/test/pmdbg.c
@@ -278,7 +278,3 @@ MRESULT EXPENTRY MyWindowProc( HWND hwnd, USHORT msg, MPARAM mp1, MPARAM mp2 )
     return FALSE;
 }
 /**********************  End of window procedure  ***********************/
-
-extern void StackCheck( void );
-#pragma aux StackCheck "__STK";
-void StackCheck( void ) {}
diff --git a/bld/trap/lcl/os2v2/c/pmdbg.c b/bld/trap/lcl/os2v2/c/pmdbg.c
index 50016a020c..2ce2932110 100644
--- a/bld/trap/lcl/os2v2/c/pmdbg.c
+++ b/bld/trap/lcl/os2v2/c/pmdbg.c
@@ -280,7 +280,3 @@ MRESULT EXPENTRY MyWindowProc( HWND hwnd, USHORT msg, MPARAM mp1, MPARAM mp2 )
     return FALSE;
 }
 /**********************  End of window procedure  ***********************/
-
-extern void StackCheck( void );
-#pragma aux StackCheck "__STK";
-void StackCheck( void ) {}
diff --git a/bld/trap/lcl/os2v2/test/pmdbg.c b/bld/trap/lcl/os2v2/test/pmdbg.c
index 50016a020c..2ce2932110 100644
--- a/bld/trap/lcl/os2v2/test/pmdbg.c
+++ b/bld/trap/lcl/os2v2/test/pmdbg.c
@@ -280,7 +280,3 @@ MRESULT EXPENTRY MyWindowProc( HWND hwnd, USHORT msg, MPARAM mp1, MPARAM mp2 )
     return FALSE;
 }
 /**********************  End of window procedure  ***********************/
-
-extern void StackCheck( void );
-#pragma aux StackCheck "__STK";
-void StackCheck( void ) {}