diff --git a/src/lua/lua_ipc.h b/include/lua/ipc.h
similarity index 100%
rename from src/lua/lua_ipc.h
rename to include/lua/ipc.h
diff --git a/src/lua/lua_socket.h b/include/lua/socket.h
similarity index 100%
rename from src/lua/lua_socket.h
rename to include/lua/socket.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3c2cec6cc56ca687ce63443c0e4998d04f314a8..9a6678d780279172dc6eca6c8a742043483bfbdc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,8 +115,8 @@ set (common_sources
      lua/errinj.cc
      lua/slab.cc
      lua/plugin.cc
-     lua/lua_ipc.cc
-     lua/lua_socket.cc
+     lua/ipc.cc
+     lua/socket.cc
      lua/session.cc
      lua/cjson.cc
      lua/yaml.cc
diff --git a/src/box/lua/misc.lua b/src/box/lua/misc.lua
index 55e6da7aa00c27a62f12c73848d2580c376b4a49..de7bd29fdf21135501e1ad4ff871010fc88b7f5a 100644
--- a/src/box/lua/misc.lua
+++ b/src/box/lua/misc.lua
@@ -80,8 +80,6 @@ function help()
 		"box.slab.check()",
 		"box.fiber.info()",
 		"box.plugin.info()",
-		"box.errinj.info()",
-		"box.errinj.set()",
 		"box.cfg()",
 		"box.cfg_reload()",
 		"box.coredump()"
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 9beee872c76408377e7773c887c78872c15e7964..5b197d59788b9426007d078725cde97895d89333 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -50,8 +50,8 @@ extern "C" {
 #include "lua/fiber.h"
 #include "lua/admin.h"
 #include "lua/errinj.h"
-#include "lua_ipc.h"
-#include "lua_socket.h"
+#include "lua/ipc.h"
+#include "lua/socket.h"
 #include "lua/info.h"
 #include "lua/slab.h"
 #include "lua/stat.h"
diff --git a/src/lua/lua_ipc.cc b/src/lua/ipc.cc
similarity index 99%
rename from src/lua/lua_ipc.cc
rename to src/lua/ipc.cc
index da40956ca606c96eb317436ed6e6d3dad5c8de34..86799b5372308ed746b56fa97bd4fcd2eabbcf28 100644
--- a/src/lua/lua_ipc.cc
+++ b/src/lua/ipc.cc
@@ -26,7 +26,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "lua_ipc.h"
 
 #include <stdlib.h>
 
@@ -37,6 +36,7 @@ extern "C" {
 } /* extern "C" */
 
 #include "ipc.h"
+#include "lua/ipc.h"
 #include "lua/init.h"
 
 static const char channel_lib[]   = "box.ipc.channel";
diff --git a/src/lua/lua_socket.cc b/src/lua/socket.cc
similarity index 99%
rename from src/lua/lua_socket.cc
rename to src/lua/socket.cc
index 710642eb001e7793d3f8e7212053ae3043e74d06..8beb0d446d76ee3e01f704ee54805dffa003b2bd 100644
--- a/src/lua/lua_socket.cc
+++ b/src/lua/socket.cc
@@ -26,7 +26,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "lua_socket.h"
+#include "lua/socket.h"
 
 extern "C" {
 #include <lua.h>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 88f26e30f802817c8231269ab53af2b1219ff9c4..f26d79ce513d03bd31ddd19f8acabcdfdfd5ac93 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,6 @@ add_custom_target(test-force
     COMMAND ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --force --vardir=${PROJECT_BINARY_DIR}/test/var)
 
 add_subdirectory(unit)
-add_subdirectory(box)
 add_subdirectory(connector_c)
 
 if (ENABLE_RPM)