diff --git a/.gitignore b/.gitignore
index 5876f1430dc2c30872cb11f1ab4d3ba61e8d0240..b99d0325dc4025dc0980b3a4613e1327d3684316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ doc/www-data/*.html
 doc/www-data/*.ru.html
 doc/www-data.in/download
 extra/rpm.spec
-include/config.h
+include/tarantool/config.h
 install_manifest.txt
 lcov
 src/lua/*.lua.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa64b285b029149c300ec7458828ea6b6d1323fb..73a8b7c479ecb971cdcab03d4bd07870432b32c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ find_program(POD2MAN pod2man)
 set (TARANTOOL_PRODUCT "box")
 set (TARANTOOL_MODULES "box")
 set (TARANTOOL_CLIENTS "tarantool_checksum")
-# Define PACKAGE macro in config.h
+# Define PACKAGE macro in tarantool/config.h
 set (PACKAGE "Tarantool")
 
 #
@@ -53,7 +53,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
 
 set(PLUGIN_DIR
-	${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/tarantool/plugins)
+	${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/tarantool/plugin)
 
 set(CMAKE_OBJC_FLAGS)
 set(CMAKE_OBJCXX_FLAGS)
@@ -364,8 +364,8 @@ set(TARANTOOL_CXX_COMPILER ${CMAKE_CXX_COMPILER})
 # of the script to make sure all variables are set.
 #
 configure_file(
-    "${PROJECT_SOURCE_DIR}/include/config.h.cmake"
-    "${PROJECT_BINARY_DIR}/include/config.h"
+    "${PROJECT_SOURCE_DIR}/include/tarantool/config.h.cmake"
+    "${PROJECT_BINARY_DIR}/include/tarantool/config.h"
     )
 configure_file(
     "${PROJECT_SOURCE_DIR}/doc/tnt.ent.cmake"
diff --git a/include/box/box.h b/include/box/box.h
index ff250eec86cdbdd61b17a743dead9fc1ec372393..43808bc50fdaf47fee816d340103aec59dd4ee93 100644
--- a/include/box/box.h
+++ b/include/box/box.h
@@ -28,7 +28,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <util.h>
+#include "tarantool/util.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/coeio.h b/include/coeio.h
index e1406b9d71fdb07e51addc3f25639bfa93652106..cee7be29284f654c22a0aa0170ae08b8e411d73b 100644
--- a/include/coeio.h
+++ b/include/coeio.h
@@ -29,7 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "tarantool/config.h"
+#include "tarantool/util.h"
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -38,7 +39,6 @@
 #include <tarantool_ev.h>
 #include <tarantool_eio.h>
 #include <coro.h>
-#include <util.h>
 #include <rlist.h>
 
 #include <sys/types.h>
diff --git a/include/crc32.h b/include/crc32.h
index fae404eb72762cf318c59b9c4e470b7b02d8d534..105c993ea24b16ee8cdb68ffd6ed3a695b3c8bfc 100644
--- a/include/crc32.h
+++ b/include/crc32.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/types.h>
-#include <util.h>
+#include "tarantool/util.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/errcode.h b/include/errcode.h
index 1128e8e25e8829443ee9bbcc1295df1128211ea9..5fa333d236e8c509ac08d43385b12de521472a8d 100644
--- a/include/errcode.h
+++ b/include/errcode.h
@@ -30,7 +30,7 @@
  */
 #include <stdint.h>
 
-#include <util.h>
+#include "tarantool/util.h"
 
 struct errcode_record {
 	const char *errstr;
diff --git a/include/errinj.h b/include/errinj.h
index 28be14dc7bd94fbbb9978a847ac7d65d42bd0bca..43d20e56bbb7fcb761878526ccfc87c4d6306600 100644
--- a/include/errinj.h
+++ b/include/errinj.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include "exception.h"
-#include "util.h"
+#include "tarantool/util.h"
 
 struct errinj {
 	const char *name;
diff --git a/include/fiber.h b/include/fiber.h
index 5a2c7db5e252f0cfbb296c4a8fa40254d38494a8..0416c4d0ab2664f147a7f1acc083cb3fb1e15bc3 100644
--- a/include/fiber.h
+++ b/include/fiber.h
@@ -28,14 +28,14 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <tarantool_ev.h>
 #include <coro.h>
-#include <util.h>
+#include <tarantool/util.h>
 #include "third_party/queue.h"
 
 #if defined(__cplusplus)
diff --git a/include/iobuf.h b/include/iobuf.h
index c05a41e69e385a71e931180480156ddba5c9154e..c70639f99c289ed0414782f32a5f578b55d2ead4 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -30,7 +30,7 @@
  */
 #include <sys/uio.h>
 #include <stdbool.h>
-#include "util.h"
+#include "tarantool/util.h"
 #include "third_party/queue.h"
 
 struct ev_io;
diff --git a/include/lib/bit/bit.h b/include/lib/bit/bit.h
index 08274fddfa7594c8546910639801a24991418c1c..00ba076ecf9e8a726fec6e4582866de1c10650e3 100644
--- a/include/lib/bit/bit.h
+++ b/include/lib/bit/bit.h
@@ -33,7 +33,7 @@
  * @file
  * @brief Bit manipulation library
  */
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/lib/bitset/bitset.h b/include/lib/bitset/bitset.h
index ac7b97177a359124e805fb80e46ca5a672ce9f5f..fe683267ef5c3d6cccc733efb8703a43578bd96e 100644
--- a/include/lib/bitset/bitset.h
+++ b/include/lib/bitset/bitset.h
@@ -41,7 +41,7 @@
  * container grows automatically.
  */
 
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/log_io.h b/include/log_io.h
index 58e9f4e7e88d442ae19586e67fb8e17d787eaea2..2493f914148bb6b22276298cb84878352fd79c83 100644
--- a/include/log_io.h
+++ b/include/log_io.h
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <stdbool.h>
-#include "util.h"
+#include "tarantool/util.h"
 #include "tbuf.h"
 #include "tarantool_ev.h"
 
diff --git a/include/palloc.h b/include/palloc.h
index 0557cd620f49b867b90f2fbbea83c4d37b4bb1ca..d1f89569e73a1091a77fa8bd8c3255318f516d1a 100644
--- a/include/palloc.h
+++ b/include/palloc.h
@@ -30,7 +30,7 @@
  */
 #include <stddef.h>
 #include <stdint.h>
-#include "util.h"
+#include "tarantool/util.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/recovery.h b/include/recovery.h
index aad3a00eab4695375780e000f20bcd453a1b0b27..97f7673fd0d4607a82f715cb2a6d6d47c79f3cb8 100644
--- a/include/recovery.h
+++ b/include/recovery.h
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <netinet/in.h>
 
-#include "util.h"
+#include "tarantool/util.h"
 #include "tarantool_ev.h"
 
 #if defined(__cplusplus)
diff --git a/include/replication.h b/include/replication.h
index 608cafe73d96b56084f84be0a160059bceba036c..7667ceca31e1996e10d8af65551e0eb69e5c86e5 100644
--- a/include/replication.h
+++ b/include/replication.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <tarantool.h>
-#include <util.h>
+#include "tarantool/util.h"
 
 /**
  * Check replication configuration.
diff --git a/include/salloc.h b/include/salloc.h
index dab868314004aa0e9d46e7760152c292b482adbb..0b9cd53ec0d17594ad293b47bb1ce2b3494c6435 100644
--- a/include/salloc.h
+++ b/include/salloc.h
@@ -30,7 +30,7 @@
  */
 #include <stddef.h>
 #include <stdbool.h>
-#include "util.h" /* for u64 */
+#include "tarantool/util.h" /* for u64 */
 
 struct tbuf;
 
diff --git a/include/say.h b/include/say.h
index 02df38ed0ea34db26713d7dedcda4318fa9b1ee7..fa1856454ab22278ed5334e26d113116510a3afe 100644
--- a/include/say.h
+++ b/include/say.h
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include <util.h> /* for FORMAT_PRINTF */
+#include "tarantool/util.h" /* for FORMAT_PRINTF */
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/tarantool.h b/include/tarantool.h
index c28fe745393bfd2aee4ce51c9e1ad5e80210ba60..f9589f2ffeb4bf9204d74e95f5f210aba6acbc08 100644
--- a/include/tarantool.h
+++ b/include/tarantool.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <stdbool.h>
-#include <util.h>
+#include "tarantool/util.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/config.h.cmake b/include/tarantool/config.h.cmake
similarity index 100%
rename from include/config.h.cmake
rename to include/tarantool/config.h.cmake
diff --git a/include/tarantool_plugin.h b/include/tarantool/plugin.h
similarity index 100%
rename from include/tarantool_plugin.h
rename to include/tarantool/plugin.h
diff --git a/include/util.h b/include/tarantool/util.h
similarity index 100%
rename from include/util.h
rename to include/tarantool/util.h
diff --git a/include/tbuf.h b/include/tbuf.h
index 89f1654f18c8b24597614055ae50dc0b59347dc0..551ef726fada37f2b5c48bc83c45a3637b2dbf0c 100644
--- a/include/tbuf.h
+++ b/include/tbuf.h
@@ -32,7 +32,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <util.h>
+#include "tarantool/util.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/tarantool_pthread.h b/include/tt_pthread.h
similarity index 98%
rename from include/tarantool_pthread.h
rename to include/tt_pthread.h
index 0540975acd11fae24ff89e46af7d695ad9626fcf..9f28cc73d1c2e5972f6b1348d73d101bd9a39c19 100644
--- a/include/tarantool_pthread.h
+++ b/include/tt_pthread.h
@@ -29,10 +29,10 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <pthread.h>
-#include <util.h>
+#include "tarantool/util.h"
 #include <say.h>
 
 /**
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f606db769755e0d58ca209f76aeed007bab2cf08..78145267b547b293e652c62ad188207dd0e40a7f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 enable_tnt_compile_flags()
 
 
-add_subdirectory(plugins)
+add_subdirectory(plugin)
 
 include_directories(${LIBEV_INCLUDE_DIR})
 include_directories(${LIBEIO_INCLUDE_DIR})
diff --git a/src/admin.cc b/src/admin.cc
index 9ebe117d892fd2a5231f91c80583d73ce462d03e..02f717a0a6510df3bbe274c7545df70e0ab81cba 100644
--- a/src/admin.cc
+++ b/src/admin.cc
@@ -43,7 +43,7 @@
 #include "lua/init.h"
 #include <recovery.h>
 #include <tbuf.h>
-#include <util.h>
+#include "tarantool/util.h"
 #include <errinj.h>
 #include "coio_buf.h"
 
diff --git a/src/admin.rl b/src/admin.rl
index d978766c03582bfbc6ca82c3fbd6373fa7e4941d..56bd8b30006ad01034d3800e4927cd8c313f01fc 100644
--- a/src/admin.rl
+++ b/src/admin.rl
@@ -41,7 +41,7 @@
 #include "lua/init.h"
 #include <recovery.h>
 #include <tbuf.h>
-#include <util.h>
+#include "tarantool/util.h"
 #include <errinj.h>
 #include "coio_buf.h"
 
diff --git a/src/box/index.h b/src/box/index.h
index 8935ce9e8a3f41816e27a19ec044c84682c01f0f..a26b520ab88c291b38e4e9249c5f245d3c938c67 100644
--- a/src/box/index.h
+++ b/src/box/index.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <stdbool.h>
-#include <util.h>
+#include "tarantool/util.h"
 
 #include "object.h"
 
diff --git a/src/box/port.h b/src/box/port.h
index 38375ff9df8cbe06145b13e4b0f55b45047ef730..ba6e7333dae72929b0a09024f7e0d7a40821723a 100644
--- a/src/box/port.h
+++ b/src/box/port.h
@@ -28,7 +28,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <util.h>
+#include "tarantool/util.h"
 
 struct tuple;
 struct port;
diff --git a/src/box/request.h b/src/box/request.h
index 45f50577d56e07ba7dac4a68d256cc4129b67ca1..5befeec28c8d42d1ebfdc89c1a712869eb48e9ef 100644
--- a/src/box/request.h
+++ b/src/box/request.h
@@ -28,7 +28,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <util.h>
+#include "tarantool/util.h"
 #include <stdbool.h>
 
 struct txn;
diff --git a/src/box/tuple.h b/src/box/tuple.h
index d4f8307f75a3b74afe129eb1ecadfba79ac76ded..21f0904aebb686e16a53edf32c70745980afdf70 100644
--- a/src/box/tuple.h
+++ b/src/box/tuple.h
@@ -28,7 +28,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <util.h>
+#include "tarantool/util.h"
 #include <pickle.h>
 
 struct tbuf;
diff --git a/src/box/tuple_update.h b/src/box/tuple_update.h
index e1da928478eb053618e88c895800d6390b57d5aa..5bc7b5402646fa2c82ad59ce8de468f75846727d 100644
--- a/src/box/tuple_update.h
+++ b/src/box/tuple_update.h
@@ -30,7 +30,7 @@
  */
 
 #include <stddef.h>
-#include <util.h>
+#include "tarantool/util.h"
 
 enum {
 	/** A limit on how many operations a single UPDATE can have. */
diff --git a/src/coro.cc b/src/coro.cc
index e73e0267e7b64f7866d6f75889212592f8e22e46..915aaa9cc2f7ef18169307b28284accda2559cbd 100644
--- a/src/coro.cc
+++ b/src/coro.cc
@@ -28,7 +28,7 @@
  */
 #include "coro.h"
 
-#include "config.h"
+#include "tarantool/config.h"
 #include "exception.h"
 #include <unistd.h>
 #include <string.h>
diff --git a/src/cpu_feature.c b/src/cpu_feature.c
index 5885bac856a466bb0ca8ab05d46d01f3be47daa1..8adfac0eb7a289e34ebc606325be22451f338d14 100644
--- a/src/cpu_feature.c
+++ b/src/cpu_feature.c
@@ -26,7 +26,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <config.h>
+#include "tarantool/config.h"
 #include <sys/types.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/errinj.cc b/src/errinj.cc
index 8884c9146b896f0a28e3a78d51e067f6b826a993..8d4ac89e52c6e33174c502b411e748087e3b6d8c 100644
--- a/src/errinj.cc
+++ b/src/errinj.cc
@@ -31,8 +31,8 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "config.h"
-#include "util.h"
+#include "tarantool/config.h"
+#include "tarantool/util.h"
 #include "say.h"
 #include "tbuf.h"
 #include "errinj.h"
diff --git a/src/fiber.cc b/src/fiber.cc
index 07ac347b58d79856f42610612ce86df1de5b087f..faa881152682c8021288f9cce5cb9de27acd6538 100644
--- a/src/fiber.cc
+++ b/src/fiber.cc
@@ -27,14 +27,13 @@
  * SUCH DAMAGE.
  */
 #include "fiber.h"
-#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <say.h>
-#include <tarantool.h>
+#include "tarantool.h"
 extern "C" {
 #include <cfg/warning.h>
 #include <cfg/tarantool_box_cfg.h>
diff --git a/src/lua/init.cc b/src/lua/init.cc
index 1855ee74a4a139aacb04b4db6f3dc6c974461438..3b6265bb7f60fddb893c1e51c0d99a1386656e21 100644
--- a/src/lua/init.cc
+++ b/src/lua/init.cc
@@ -60,7 +60,7 @@ extern "C" {
 #include <dlfcn.h>
 #include <dirent.h>
 #include <stdio.h>
-#include <tarantool_plugin.h>
+#include "tarantool/plugin.h"
 
 static RLIST_HEAD(loaded_plugins);
 
diff --git a/src/palloc.cc b/src/palloc.cc
index 1a35530fee38b9c58227f302f2904c94e7ac1520..c1b009eca7201dde58b1d5f9541849bb8ae3f9ea 100644
--- a/src/palloc.cc
+++ b/src/palloc.cc
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 #include "palloc.h"
+#include "tarantool/config.h"
 #include "third_party/valgrind/memcheck.h"
-#include "config.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/src/plugins/CMakeLists.txt b/src/plugin/CMakeLists.txt
similarity index 100%
rename from src/plugins/CMakeLists.txt
rename to src/plugin/CMakeLists.txt
diff --git a/src/plugins/mysql/CMakeLists.txt b/src/plugin/mysql/CMakeLists.txt
similarity index 100%
rename from src/plugins/mysql/CMakeLists.txt
rename to src/plugin/mysql/CMakeLists.txt
diff --git a/src/plugins/mysql/mysql.cc b/src/plugin/mysql/mysql.cc
similarity index 100%
rename from src/plugins/mysql/mysql.cc
rename to src/plugin/mysql/mysql.cc
diff --git a/src/plugins/pg/CMakeLists.txt b/src/plugin/pg/CMakeLists.txt
similarity index 100%
rename from src/plugins/pg/CMakeLists.txt
rename to src/plugin/pg/CMakeLists.txt
diff --git a/src/plugins/pg/pg.cc b/src/plugin/pg/pg.cc
similarity index 100%
rename from src/plugins/pg/pg.cc
rename to src/plugin/pg/pg.cc
diff --git a/src/recovery.cc b/src/recovery.cc
index ae63cf09451121be4d42d57098a905eb55c341f3..ae76f960855668fcc66f70d522e7e725a0e26687 100644
--- a/src/recovery.cc
+++ b/src/recovery.cc
@@ -32,7 +32,7 @@
 
 #include "log_io.h"
 #include "fiber.h"
-#include "tarantool_pthread.h"
+#include "tt_pthread.h"
 #include "fio.h"
 #include "errinj.h"
 
diff --git a/src/salloc.cc b/src/salloc.cc
index 1ba9876f1b9f3a83beeeb4b37e2da779e69f519b..12257843c6a84cbf39c715e682578dc5f4331e90 100644
--- a/src/salloc.cc
+++ b/src/salloc.cc
@@ -28,7 +28,7 @@
  */
 #include "salloc.h"
 
-#include "config.h"
+#include "tarantool/config.h"
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -38,7 +38,7 @@
 
 #include "third_party/valgrind/memcheck.h"
 #include <third_party/queue.h>
-#include <util.h>
+#include "tarantool/util.h"
 #include <tbuf.h>
 #include <say.h>
 #include "exception.h"
diff --git a/src/stat.cc b/src/stat.cc
index 703245f6c5e2783030cb55292ebc528b6ff8e2c6..ad26f2a6e1b33227a9c1f7975ed9e287be175424 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -28,7 +28,7 @@
  */
 #include "stat.h"
 
-#include <util.h>
+#include "tarantool/util.h"
 #include <tarantool_ev.h>
 #include <tbuf.h>
 #include <say.h>
diff --git a/src/tarantool.cc b/src/tarantool.cc
index 2fccc14804baceb1257d055b193b3bec4ec36442..ed14d00fbee87208eb168a95029eee8eb0ffb1d2 100644
--- a/src/tarantool.cc
+++ b/src/tarantool.cc
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include "tarantool.h"
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,13 +58,13 @@
 #include <say.h>
 #include <stat.h>
 #include <limits.h>
-#include <util.h>
+#include "tarantool/util.h"
 extern "C" {
 #include <cfg/warning.h>
 #include <cfg/tarantool_box_cfg.h>
 #include <third_party/gopt/gopt.h>
 } /* extern "C" */
-#include "tarantool_pthread.h"
+#include "tt_pthread.h"
 #include "lua/init.h"
 #include "memcached.h"
 #include "session.h"
diff --git a/src/tbuf.c b/src/tbuf.c
index 605b3cf44ab4dec662d560468a92857ed3158c0c..74631d9f99805c2cf79c4a92c7c77a5823b6cc1e 100644
--- a/src/tbuf.c
+++ b/src/tbuf.c
@@ -35,7 +35,6 @@
 #include <stdbool.h>
 
 #include <palloc.h>
-#include <util.h>
 
 #ifdef POISON
 #  define TBUF_POISON
diff --git a/src/util.c b/src/util.c
index 2e5c5c70761d8dda39e56641b487e3613a9bf1cb..83c674eeed96d5cb8dd386f967e21c6cf8580489 100644
--- a/src/util.c
+++ b/src/util.c
@@ -26,7 +26,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "util.h"
+#include "tarantool/util.h"
 
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/test/box/protocol.c b/test/box/protocol.c
index eead65d78d9097e8f5e992558d4c930365c62fba..8d4b348963fff9d54f1cb24ad1532bd332d36fc0 100644
--- a/test/box/protocol.c
+++ b/test/box/protocol.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "util.h"
+#include "tarantool/util.h"
 #include "errcode.h"
 
 #include <tarantool/tnt.h>
diff --git a/test/connector_c/update.c b/test/connector_c/update.c
index feb0fa5e0de7ecb5a3b4f7e41c17bf0ca0edcd96..4aa27709700fd77300016df9d119c0f278414149 100644
--- a/test/connector_c/update.c
+++ b/test/connector_c/update.c
@@ -34,7 +34,7 @@
 #include <connector/c/include/tarantool/tnt_net.h>
 #include <connector/c/include/tarantool/tnt_io.h>
 
-#include <util.h>
+#include "tarantool/util.h"
 #include <errcode.h>
 #include <unit.h>
 
diff --git a/third_party/README b/third_party/README
index cb552fe67c526aa4fa68f39b811873d38f4d0c09..e11f8bae7359f2ef64b778cae63f90c8e773dfbb 100644
--- a/third_party/README
+++ b/third_party/README
@@ -43,6 +43,8 @@ Note: we have two important changes to the stock libeio:
   A larger stack size is necessary to make getaddrinfo()
   work.
 
+- replace config.h with tarantool/config.h in eio.c
+
 Otherwise: cvs up
 
 How to update rb.h
diff --git a/third_party/libeio/eio.c b/third_party/libeio/eio.c
index cbbf117b7127b54d4cc7f0b55165e102695c247e..dd9542c1557f4ce4741d491eae065f0915a344c1 100644
--- a/third_party/libeio/eio.c
+++ b/third_party/libeio/eio.c
@@ -38,7 +38,7 @@
  */
 
 #ifndef _WIN32
-# include "config.h"
+# include "tarantool/config.h"
 #endif
 
 #include "eio.h"
diff --git a/third_party/tarantool_eio.h b/third_party/tarantool_eio.h
index b8cca642ec53ee708c0e91d7e6cfa0286350e270..7ee41bebf9ba0efd8fd873c01b855709ffe69a42 100644
--- a/third_party/tarantool_eio.h
+++ b/third_party/tarantool_eio.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <stdio.h>
 #include <fcntl.h> /* Definition of AT_* constants */
diff --git a/third_party/tarantool_ev.h b/third_party/tarantool_ev.h
index ccd8ed4d01dffabc30ede95e940ad8b0056f51d7..ee9b6a37a26dd77f12dd4a4e238a94482d43b309 100644
--- a/third_party/tarantool_ev.h
+++ b/third_party/tarantool_ev.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "tarantool/config.h"
 
 #include <time.h>
 #include <sys/types.h>