--- a/cmake.deps/cmake/BuildLuajit.cmake
+++ b/cmake.deps/cmake/BuildLuajit.cmake
@@ -30,6 +30,8 @@
 set(BUILDCMD_UNIX ${MAKE_PRG} -j CFLAGS=-fPIC
                               CFLAGS+=-DLUA_USE_APICHECK
                               CFLAGS+=-funwind-tables
+                              CFLAGS+=-DLUAJIT_UNWIND_EXTERNAL
+                              BUILDMODE=static
                               ${NO_STACK_CHECK}
                               ${AMD64_ABI}
                               CCDEBUG+=-g
--- a/src/nvim/lib/queue_defs.h
+++ b/src/nvim/lib/queue_defs.h
@@ -21,9 +21,9 @@
 
 #include <stddef.h>
 
-typedef struct queue {
-  struct queue *next;
-  struct queue *prev;
+typedef struct nvim_queue {
+  struct nvim_queue *next;
+  struct nvim_queue *prev;
 } QUEUE;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS