Index: sys/contrib/lua/src/lapi.c
===================================================================
--- sys/contrib/lua/src/lapi.c
+++ sys/contrib/lua/src/lapi.c
@@ -9,9 +9,12 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdarg.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lauxlib.h
===================================================================
--- sys/contrib/lua/src/lauxlib.h
+++ sys/contrib/lua/src/lauxlib.h
@@ -8,9 +8,13 @@
 #ifndef lauxlib_h
 #define lauxlib_h
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#include <lstd.h>
+#else
 #include <stddef.h>
 #include <stdio.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lauxlib.c
===================================================================
--- sys/contrib/lua/src/lauxlib.c
+++ sys/contrib/lua/src/lauxlib.c
@@ -9,13 +9,15 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#endif
 
 /* This file uses only the official API of Lua.
 ** Any function declared here could be written as an application function.
Index: sys/contrib/lua/src/lbaselib.c
===================================================================
--- sys/contrib/lua/src/lbaselib.c
+++ sys/contrib/lua/src/lbaselib.c
@@ -9,11 +9,14 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lcode.c
===================================================================
--- sys/contrib/lua/src/lcode.c
+++ sys/contrib/lua/src/lcode.c
@@ -9,9 +9,13 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#include <lstd.h>
+#else
 #include <math.h>
 #include <stdlib.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lcorolib.c
===================================================================
--- sys/contrib/lua/src/lcorolib.c
+++ sys/contrib/lua/src/lcorolib.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdlib.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ldblib.c
===================================================================
--- sys/contrib/lua/src/ldblib.c
+++ sys/contrib/lua/src/ldblib.c
@@ -9,10 +9,13 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ldebug.c
===================================================================
--- sys/contrib/lua/src/ldebug.c
+++ sys/contrib/lua/src/ldebug.c
@@ -9,10 +9,13 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdarg.h>
 #include <stddef.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ldo.c
===================================================================
--- sys/contrib/lua/src/ldo.c
+++ sys/contrib/lua/src/ldo.c
@@ -9,10 +9,15 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#include <setjmp.h>
+#include <lstd.h>
+#else
 #include <setjmp.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ldump.c
===================================================================
--- sys/contrib/lua/src/ldump.c
+++ sys/contrib/lua/src/ldump.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lfunc.c
===================================================================
--- sys/contrib/lua/src/lfunc.c
+++ sys/contrib/lua/src/lfunc.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lgc.c
===================================================================
--- sys/contrib/lua/src/lgc.c
+++ sys/contrib/lua/src/lgc.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/linit.c
===================================================================
--- sys/contrib/lua/src/linit.c
+++ sys/contrib/lua/src/linit.c
@@ -26,8 +26,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/liolib.c
===================================================================
--- sys/contrib/lua/src/liolib.c
+++ sys/contrib/lua/src/liolib.c
@@ -9,13 +9,16 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <ctype.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/llex.c
===================================================================
--- sys/contrib/lua/src/llex.c
+++ sys/contrib/lua/src/llex.c
@@ -9,9 +9,13 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#include <lstd.h>
+#else
 #include <locale.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lmathlib.c
===================================================================
--- sys/contrib/lua/src/lmathlib.c
+++ sys/contrib/lua/src/lmathlib.c
@@ -9,9 +9,12 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdlib.h>
 #include <math.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lmem.c
===================================================================
--- sys/contrib/lua/src/lmem.c
+++ sys/contrib/lua/src/lmem.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/loadlib.c
===================================================================
--- sys/contrib/lua/src/loadlib.c
+++ sys/contrib/lua/src/loadlib.c
@@ -13,9 +13,12 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lobject.c
===================================================================
--- sys/contrib/lua/src/lobject.c
+++ sys/contrib/lua/src/lobject.c
@@ -9,11 +9,14 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lopcodes.c
===================================================================
--- sys/contrib/lua/src/lopcodes.c
+++ sys/contrib/lua/src/lopcodes.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
+#endif
 
 #include "lopcodes.h"
 
Index: sys/contrib/lua/src/loslib.c
===================================================================
--- sys/contrib/lua/src/loslib.c
+++ sys/contrib/lua/src/loslib.c
@@ -9,12 +9,15 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <errno.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lparser.c
===================================================================
--- sys/contrib/lua/src/lparser.c
+++ sys/contrib/lua/src/lparser.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lstate.c
===================================================================
--- sys/contrib/lua/src/lstate.c
+++ sys/contrib/lua/src/lstate.c
@@ -9,9 +9,12 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <stddef.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lstring.c
===================================================================
--- sys/contrib/lua/src/lstring.c
+++ sys/contrib/lua/src/lstring.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lstrlib.c
===================================================================
--- sys/contrib/lua/src/lstrlib.c
+++ sys/contrib/lua/src/lstrlib.c
@@ -9,13 +9,16 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <ctype.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ltable.c
===================================================================
--- sys/contrib/lua/src/ltable.c
+++ sys/contrib/lua/src/ltable.c
@@ -22,11 +22,14 @@
 ** to it), then the colliding element is in its own main position.
 ** Hence even when the load factor reaches 100%, performance remains good.
 */
-
 #include <float.h>
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <math.h>
 #include <string.h>
 #include <limits.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ltablib.c
===================================================================
--- sys/contrib/lua/src/ltablib.c
+++ sys/contrib/lua/src/ltablib.c
@@ -9,9 +9,12 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <limits.h>
 #include <stddef.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/ltm.c
===================================================================
--- sys/contrib/lua/src/ltm.c
+++ sys/contrib/lua/src/ltm.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lua.c
===================================================================
--- sys/contrib/lua/src/lua.c
+++ sys/contrib/lua/src/lua.c
@@ -8,11 +8,14 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/luac.c
===================================================================
--- sys/contrib/lua/src/luac.c
+++ sys/contrib/lua/src/luac.c
@@ -9,11 +9,15 @@
 
 #include "lprefix.h"
 
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 #include "lauxlib.h"
Index: sys/contrib/lua/src/luaconf.h
===================================================================
--- sys/contrib/lua/src/luaconf.h
+++ sys/contrib/lua/src/luaconf.h
@@ -9,7 +9,11 @@
 #define luaconf_h
 
 #include <limits.h>
+#ifdef BOOT_LUA
+#include <lstd.h>
+#else
 #include <stddef.h>
+#endif
 
 
 /*
Index: sys/contrib/lua/src/lundump.c
===================================================================
--- sys/contrib/lua/src/lundump.c
+++ sys/contrib/lua/src/lundump.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lutf8lib.c
===================================================================
--- sys/contrib/lua/src/lutf8lib.c
+++ sys/contrib/lua/src/lutf8lib.c
@@ -9,10 +9,13 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lvm.c
===================================================================
--- sys/contrib/lua/src/lvm.c
+++ sys/contrib/lua/src/lvm.c
@@ -9,11 +9,15 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#include <lstd.h>
+#else
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#endif
 
 #include "lua.h"
 
Index: sys/contrib/lua/src/lzio.c
===================================================================
--- sys/contrib/lua/src/lzio.c
+++ sys/contrib/lua/src/lzio.c
@@ -9,8 +9,11 @@
 
 #include "lprefix.h"
 
-
+#ifdef BOOT_LUA
+#include <stand.h>
+#else
 #include <string.h>
+#endif
 
 #include "lua.h"