diff --git a/.gitignore b/.gitignore
index adf8f72..2cd3656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,8 @@
 # Binaries for programs and plugins
 *.exe
 *.exe~
-*.dll
-*.so
 *.dylib
+*.dll
 
 # Test binary, built with `go test -c`
 *.test
@@ -21,3 +20,4 @@
 # Go workspace file
 go.work
 
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/ljtg.iml b/.idea/ljtg.iml
deleted file mode 100644
index 5e764c4..0000000
--- a/.idea/ljtg.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
deleted file mode 100644
index c84a72c..0000000
--- a/.idea/material_theme_project_new.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MaterialThemeProjectNewConfig">
-    <option name="metadata">
-      <MTProjectMetadataState>
-        <option name="userId" value="3fdbffe2:19499e3ad4d:-7fff" />
-      </MTProjectMetadataState>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 185b2cc..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ljtg.iml" filepath="$PROJECT_DIR$/.idea/ljtg.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index b295e65..06c7d49 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # LuaJIT-to-Go
 
-Go wrapper for LuaJIT.
\ No newline at end of file
+Go wrapper for LuaJIT. Uses amalgamated static libraries for LuaJIT 5.1.
\ No newline at end of file
diff --git a/lib/linux/libluajit.a b/lib/linux/libluajit.a
deleted file mode 100644
index 1612874..0000000
Binary files a/lib/linux/libluajit.a and /dev/null differ
diff --git a/lib/linux/libluajit.so b/lib/linux/libluajit.so
deleted file mode 100644
index 93bd3b4..0000000
Binary files a/lib/linux/libluajit.so and /dev/null differ
diff --git a/lib/windows/liblua51.a b/lib/windows/liblua51.a
deleted file mode 100644
index dbacba4..0000000
Binary files a/lib/windows/liblua51.a and /dev/null differ
diff --git a/lib/windows/libluajit-5.1.dll.a b/lib/windows/libluajit-5.1.dll.a
deleted file mode 100644
index a492621..0000000
Binary files a/lib/windows/libluajit-5.1.dll.a and /dev/null differ
diff --git a/lib/windows/libluajit.a b/lib/windows/libluajit.a
deleted file mode 100644
index 1612874..0000000
Binary files a/lib/windows/libluajit.a and /dev/null differ
diff --git a/lib/windows/lua51.dll b/lib/windows/lua51.dll
deleted file mode 100644
index d41deed..0000000
Binary files a/lib/windows/lua51.dll and /dev/null differ
diff --git a/include/lauxlib.h b/vendor/luajit/include/lauxlib.h
similarity index 100%
rename from include/lauxlib.h
rename to vendor/luajit/include/lauxlib.h
diff --git a/include/lua.h b/vendor/luajit/include/lua.h
similarity index 100%
rename from include/lua.h
rename to vendor/luajit/include/lua.h
diff --git a/include/luaconf.h b/vendor/luajit/include/luaconf.h
similarity index 100%
rename from include/luaconf.h
rename to vendor/luajit/include/luaconf.h
diff --git a/include/luajit.h b/vendor/luajit/include/luajit.h
similarity index 100%
rename from include/luajit.h
rename to vendor/luajit/include/luajit.h
diff --git a/include/lualib.h b/vendor/luajit/include/lualib.h
similarity index 100%
rename from include/lualib.h
rename to vendor/luajit/include/lualib.h
diff --git a/vendor/luajit/linux/libluajit.a b/vendor/luajit/linux/libluajit.a
new file mode 100644
index 0000000..8537c50
Binary files /dev/null and b/vendor/luajit/linux/libluajit.a differ
diff --git a/vendor/luajit/windows/libluajit.a b/vendor/luajit/windows/libluajit.a
new file mode 100644
index 0000000..8fd677f
Binary files /dev/null and b/vendor/luajit/windows/libluajit.a differ
diff --git a/wrapper.go b/wrapper.go
index a380fa7..14fb8ed 100644
--- a/wrapper.go
+++ b/wrapper.go
@@ -1,9 +1,9 @@
 package luajit
 
 /*
-#cgo CFLAGS: -I${SRCDIR}/include
-#cgo windows LDFLAGS: -L${SRCDIR}/lib/windows -llua51
-#cgo !windows LDFLAGS: -L${SRCDIR}/lib/linux -lluajit
+#cgo CFLAGS: -I${SRCDIR}/vendor/luajit/include
+#cgo windows LDFLAGS: -L${SRCDIR}/vendor/luajit/windows -lluajit -static
+#cgo !windows LDFLAGS: -L${SRCDIR}/vendor/luajit/linux -lluajit -static
 
 #include <lua.h>
 #include <lualib.h>