2 files changed, 9 insertions, 9 deletions
diff --git a/src/mpack/lmpack.c b/src/mpack/lmpack.c
index 6da28fc263..9f102fc950 100644
--- a/src/mpack/lmpack.c
+++ b/src/mpack/lmpack.c
@@ -15,8 +15,6 @@
  * compilation.
  */
 #define LUA_LIB
-/* for snprintf */
-#define _XOPEN_SOURCE 500
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,12 +24,11 @@
 #include <lua.h>
 #include <luaconf.h>
 
-#ifdef MPACK_USE_SYSTEM
-# include <mpack.h>
-#else
-# define MPACK_API static
-# include "mpack-src/src/mpack.c"
-#endif
+#include "nvim/macros.h"
+
+#include "lmpack.h"
+
+#include "rpc.h"
 
 #define UNPACKER_META_NAME "mpack.Unpacker"
 #define PACKER_META_NAME "mpack.Packer"
@@ -713,7 +710,7 @@ static void lmpack_unparse_enter(mpack_parser_t *parser, mpack_node_t *node)
         node->tok = mpack_pack_nil();
         break;
       }
-    /* Fallthrough */
+      FALLTHROUGH;
     default:
 	  {
 		/* #define FMT */
diff --git a/src/mpack/lmpack.h b/src/mpack/lmpack.h
new file mode 100644
index 0000000000..e35f40fab6
--- /dev/null
+++ b/src/mpack/lmpack.h
@@ -0,0 +1,3 @@
+#include <lua.h>
+
+int luaopen_mpack(lua_State *L);