diff --git a/src/lib/bitset/bitset.h b/src/lib/bitset/bitset.h
index 45fd18b9078c51d28925462e20fa78326122f1ec..e2ae4f5f6b47ba600a960ffaf7d255021ee048f1 100644
--- a/src/lib/bitset/bitset.h
+++ b/src/lib/bitset/bitset.h
@@ -1,6 +1,5 @@
 #ifndef TARANTOOL_LIB_BITSET_BITSET_H_INCLUDED
 #define TARANTOOL_LIB_BITSET_BITSET_H_INCLUDED
-
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
diff --git a/src/lib/bitset/expr.h b/src/lib/bitset/expr.h
index 18668b23718ea971a5e5204e558b85f5002f193e..f3d383358cefead04d91ca6e849b1539d7bbd3b4 100644
--- a/src/lib/bitset/expr.h
+++ b/src/lib/bitset/expr.h
@@ -1,6 +1,5 @@
 #ifndef TARANTOOL_LIB_BITSET_EXPR_H_INCLUDED
 #define TARANTOOL_LIB_BITSET_EXPR_H_INCLUDED
-
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
diff --git a/src/lib/coll/coll.h b/src/lib/coll/coll.h
index 9c725712a7354d7cffcd3bf05cd3b1900f689c91..eaacff270cdd60472c84a95a4d76af59b7b6b60e 100644
--- a/src/lib/coll/coll.h
+++ b/src/lib/coll/coll.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_COLL_H_INCLUDED
-#define TARANTOOL_COLL_H_INCLUDED
+#ifndef TARANTOOL_LIB_COLL_COLL_H_INCLUDED
+#define TARANTOOL_LIB_COLL_COLL_H_INCLUDED
 /*
  * Copyright 2010-2018, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -104,4 +104,4 @@ coll_free();
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_COLL_H_INCLUDED */
+#endif /* TARANTOOL_LIB_COLL_COLL_H_INCLUDED */
diff --git a/src/lib/coll/coll_def.h b/src/lib/coll/coll_def.h
index d3af89802b74bf3f3bbde2045eddd410dae9c6b2..f31abcb4815851ae5f593931b16c45d2c1cc2915 100644
--- a/src/lib/coll/coll_def.h
+++ b/src/lib/coll/coll_def.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_COLL_DEF_H_INCLUDED
-#define TARANTOOL_COLL_DEF_H_INCLUDED
+#ifndef TARANTOOL_LIB_COLL_COLL_DEF_H_INCLUDED
+#define TARANTOOL_LIB_COLL_COLL_DEF_H_INCLUDED
 /*
  * Copyright 2010-2018, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -117,4 +117,4 @@ struct coll_def {
 	char locale[COLL_LOCALE_LEN_MAX + 1];
 };
 
-#endif /* TARANTOOL_COLL_DEF_H_INCLUDED */
+#endif /* TARANTOOL_LIB_COLL_COLL_DEF_H_INCLUDED */
diff --git a/src/lib/core/backtrace.h b/src/lib/core/backtrace.h
index 3e2484499386ebcac22819c31e68531b23ea2a08..ffdc9cd8ec240ffc725aa201d14e0e1d013b0ca1 100644
--- a/src/lib/core/backtrace.h
+++ b/src/lib/core/backtrace.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_BACKTRACE_H_INCLUDED
-#define TARANTOOL_BACKTRACE_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_BACKTRACE_H_INCLUDED
+#define TARANTOOL_LIB_CORE_BACKTRACE_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -58,4 +58,4 @@ backtrace_proc_cache_clear();
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_BACKTRACE_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_BACKTRACE_H_INCLUDED */
diff --git a/src/lib/core/cbus.h b/src/lib/core/cbus.h
index 4a12d9e797151df9e6b0505b88fbae2c0067d682..16d122779176674635b55a4d41deb23ada823144 100644
--- a/src/lib/core/cbus.h
+++ b/src/lib/core/cbus.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_CBUS_H_INCLUDED
-#define TARANTOOL_CBUS_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_CBUS_H_INCLUDED
+#define TARANTOOL_LIB_CORE_CBUS_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -444,4 +444,4 @@ cbus_unpair(struct cpipe *dest_pipe, struct cpipe *src_pipe,
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_CBUS_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_CBUS_H_INCLUDED */
diff --git a/src/lib/core/clock.h b/src/lib/core/clock.h
index 0729e4b3e795cc4904192e79fa538741a08ac52d..e31b8599adfdbb85396fafea47a8e02168667b23 100644
--- a/src/lib/core/clock.h
+++ b/src/lib/core/clock.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_CLOCK_H_INCLUDED
-#define TARANTOOL_CLOCK_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_CLOCK_H_INCLUDED
+#define TARANTOOL_LIB_CORE_CLOCK_H_INCLUDED
 /*
  * Copyright 2010-2016 Tarantool AUTHORS: please see AUTHORS file.
  *
@@ -56,4 +56,4 @@ uint64_t clock_thread64(void);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_clock_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_CLOCK_H_INCLUDED */
diff --git a/src/lib/core/coio.h b/src/lib/core/coio.h
index df8b5d67b2b458baff505554de78b9aa12e85ebb..104abf720640037196ec06521cc4ea7d2fb54c7a 100644
--- a/src/lib/core/coio.h
+++ b/src/lib/core/coio.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_COIO_H_INCLUDED
-#define TARANTOOL_COIO_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_COIO_H_INCLUDED
+#define TARANTOOL_LIB_CORE_COIO_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -236,4 +236,4 @@ coio_write_fd_timeout(int fd, const void *data, size_t size, ev_tstamp timeout);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_COIO_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_COIO_H_INCLUDED */
diff --git a/src/lib/core/coio_buf.h b/src/lib/core/coio_buf.h
index dae66b909a5346371ab3d1737c78266cd81e9810..1ad1049854307f67de8ac4a397b67928def47161 100644
--- a/src/lib/core/coio_buf.h
+++ b/src/lib/core/coio_buf.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_COIO_BUF_H_INCLUDED
-#define TARANTOOL_COIO_BUF_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_COIO_BUF_H_INCLUDED
+#define TARANTOOL_LIB_CORE_COIO_BUF_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -91,4 +91,4 @@ coio_breadn_timeout(struct ev_io *coio, struct ibuf *buf, size_t sz,
 	return n;
 }
 
-#endif /* TARANTOOL_COIO_BUF_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_COIO_BUF_H_INCLUDED */
diff --git a/src/lib/core/coio_file.h b/src/lib/core/coio_file.h
index 7db5611d4eb6bd3322ee3763da61346b983287a6..f2112ceedf28b2cc485f954a13991b4295eee55a 100644
--- a/src/lib/core/coio_file.h
+++ b/src/lib/core/coio_file.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_COIO_FILE_H
-#define INCLUDES_TARANTOOL_COIO_FILE_H
+#ifndef TARANTOOL_LIB_CORE_COIO_FILE_H_INCLUDED
+#define TARANTOOL_LIB_CORE_COIO_FILE_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -88,4 +88,4 @@ int	coio_copyfile(const char *source, const char *dest);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* INCLUDES_TARANTOOL_COIO_FILE_H */
+#endif /* TARANTOOL_LIB_CORE_COIO_FILE_H_INCLUDED */
diff --git a/src/lib/core/coio_task.h b/src/lib/core/coio_task.h
index dec34cee7cd69a096f7f600486b586095c7c7f30..bb981f0b0998d0975fe1bc6f8e42efc9ce6f2d79 100644
--- a/src/lib/core/coio_task.h
+++ b/src/lib/core/coio_task.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_COIO_TASK_H_INCLUDED
-#define TARANTOOL_COIO_TASK_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_COIO_TASK_H_INCLUDED
+#define TARANTOOL_LIB_CORE_COIO_TASK_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -173,4 +173,4 @@ coio_getaddrinfo(const char *host, const char *port,
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_COIO_TASK_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_COIO_TASK_H_INCLUDED */
diff --git a/src/lib/core/diag.h b/src/lib/core/diag.h
index a0b71f04992104dc351c45c716594d1e6d290a02..885fd1195a698248c20558108a9b3b520255c28c 100644
--- a/src/lib/core/diag.h
+++ b/src/lib/core/diag.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_DIAG_H_INCLUDED
-#define TARANTOOL_DIAG_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_DIAG_H_INCLUDED
+#define TARANTOOL_LIB_CORE_DIAG_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -274,4 +274,4 @@ BuildSocketError(const char *file, unsigned line, const char *socketname,
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_DIAG_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_DIAG_H_INCLUDED */
diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h
index 31e4dfb082976f066903e562fb77eeb262752aa5..41783cc74dc956dd9eb7effc0490ae7abbdcede1 100644
--- a/src/lib/core/errinj.h
+++ b/src/lib/core/errinj.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_ERRINJ_H_INCLUDED
-#define TARANTOOL_ERRINJ_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_ERRINJ_H_INCLUDED
+#define TARANTOOL_LIB_CORE_ERRINJ_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
diff --git a/src/lib/core/evio.h b/src/lib/core/evio.h
index fc7e1998900fd362e857d6949678499217183dd9..bd48235bca36ca0a1243c9e892d830429fe04b19 100644
--- a/src/lib/core/evio.h
+++ b/src/lib/core/evio.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_EVIO_H_INCLUDED
-#define TARANTOOL_EVIO_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_EVIO_H_INCLUDED
+#define TARANTOOL_LIB_CORE_EVIO_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -165,4 +165,4 @@ evio_setsockopt_server(int fd, int family, int type);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_EVIO_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_EVIO_H_INCLUDED */
diff --git a/src/lib/core/exception.h b/src/lib/core/exception.h
index f08d946b5362e448556db0cd4275055f6285ba7e..ede26643a85734c65de885daa1830eadb65f95f0 100644
--- a/src/lib/core/exception.h
+++ b/src/lib/core/exception.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_EXCEPTION_H_INCLUDED
-#define TARANTOOL_EXCEPTION_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_EXCEPTION_H_INCLUDED
+#define TARANTOOL_LIB_CORE_EXCEPTION_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -178,4 +178,4 @@ exception_init();
 
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_EXCEPTION_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_EXCEPTION_H_INCLUDED */
diff --git a/src/lib/core/fiber.h b/src/lib/core/fiber.h
index db58f320bc88ed5306516e6a958da11f43d5c65b..f1f5a05554c4aaec76df182fad87d001c593dc80 100644
--- a/src/lib/core/fiber.h
+++ b/src/lib/core/fiber.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIBER_H_INCLUDED
-#define TARANTOOL_FIBER_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_FIBER_H_INCLUDED
+#define TARANTOOL_LIB_CORE_FIBER_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -669,4 +669,4 @@ region_aligned_alloc_cb(void *ctx, size_t size)
 }
 
 
-#endif /* TARANTOOL_FIBER_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_FIBER_H_INCLUDED */
diff --git a/src/lib/core/fiber_channel.h b/src/lib/core/fiber_channel.h
index 9ff4640b33c84fdccd5c55afeea11fda3509eb47..0e64e14598cd2cadf737cd982bc26440da819c58 100644
--- a/src/lib/core/fiber_channel.h
+++ b/src/lib/core/fiber_channel.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIBER_CHANNEL_H_INCLUDED
-#define TARANTOOL_FIBER_CHANNEL_H_INCLUDED 1
+#ifndef TARANTOOL_LIB_CORE_FIBER_CHANNEL_H_INCLUDED
+#define TARANTOOL_LIB_CORE_FIBER_CHANNEL_H_INCLUDED 1
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -389,4 +389,4 @@ fiber_channel_put_xc(struct fiber_channel *ch, void *data)
 
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_FIBER_CHANNEL_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_FIBER_CHANNEL_H_INCLUDED */
diff --git a/src/lib/core/fiber_cond.h b/src/lib/core/fiber_cond.h
index ae9cff794aeeec77a666d7a40af60d300c214df6..87c6f2ca29f5deda98888b2f2e3949b9cd9395ee 100644
--- a/src/lib/core/fiber_cond.h
+++ b/src/lib/core/fiber_cond.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIBER_COND_H_INCLUDED
-#define TARANTOOL_FIBER_COND_H_INCLUDED 1
+#ifndef TARANTOOL_LIB_CORE_FIBER_COND_H_INCLUDED
+#define TARANTOOL_LIB_CORE_FIBER_COND_H_INCLUDED 1
 /*
  * Copyright 2010-2017, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -141,4 +141,4 @@ fiber_cond_wait_deadline(struct fiber_cond *cond, double deadline);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_FIBER_COND_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_FIBER_COND_H_INCLUDED */
diff --git a/src/lib/core/fiber_pool.h b/src/lib/core/fiber_pool.h
index 6266a62ecdbc7c871814a716cdf5d14eaab7e667..ede8b84d665a4091cfd6315c87bbd34b58ba8ea5 100644
--- a/src/lib/core/fiber_pool.h
+++ b/src/lib/core/fiber_pool.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIBER_POOL_H_INCLUDED
-#define TARANTOOL_FIBER_POOL_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_FIBER_POOL_H_INCLUDED
+#define TARANTOOL_LIB_CORE_FIBER_POOL_H_INCLUDED
 /*
  * Copyright 2010-2017, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -102,4 +102,4 @@ fiber_pool_destroy(struct fiber_pool *pool);
 }
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_FIBER_POOL_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_FIBER_POOL_H_INCLUDED */
diff --git a/src/lib/core/fio.h b/src/lib/core/fio.h
index 12749afcb19fc3ec8b555843cc14912746caad36..024e108721a9ee720f37e5ba4b3562ccf23594da 100644
--- a/src/lib/core/fio.h
+++ b/src/lib/core/fio.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIO_H_INCLUDED
-#define TARANTOOL_FIO_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_FIO_H_INCLUDED
+#define TARANTOOL_LIB_CORE_FIO_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -234,5 +234,5 @@ fio_batch_write(struct fio_batch *batch, int fd);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_FIO_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_FIO_H_INCLUDED */
 
diff --git a/src/lib/core/latch.h b/src/lib/core/latch.h
index 70507d689bdd4b0b8b21f0066c53aa8e0907bd5a..49c59cf63ac60bbf89c266afaeba61af9e528ef6 100644
--- a/src/lib/core/latch.h
+++ b/src/lib/core/latch.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_LATCH_H_INCLUDED
-#define TARANTOOL_LATCH_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_LATCH_H_INCLUDED
+#define TARANTOOL_LIB_CORE_LATCH_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -230,4 +230,4 @@ box_latch_unlock(box_latch_t *latch);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_LATCH_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_LATCH_H_INCLUDED */
diff --git a/src/lib/core/memory.h b/src/lib/core/memory.h
index c374584aeff3516db85aec88c729fe3ce460f4d6..dd9d351c76140c6cb886e9aa0de9adac06ec018f 100644
--- a/src/lib/core/memory.h
+++ b/src/lib/core/memory.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_MEMORY_H_INCLUDED
-#define TARANTOOL_MEMORY_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_MEMORY_H_INCLUDED
+#define TARANTOOL_LIB_CORE_MEMORY_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -54,4 +54,4 @@ memory_free();
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_MEMORY_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_MEMORY_H_INCLUDED */
diff --git a/src/lib/core/mpstream.h b/src/lib/core/mpstream.h
index 598cb9086c47c1c9daa3c643e981858861aaab55..69fa76f7f916b184ca0a4e49248856dc7c33b725 100644
--- a/src/lib/core/mpstream.h
+++ b/src/lib/core/mpstream.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_MPSTREAM_H_INCLUDED
-#define TARANTOOL_MPSTREAM_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_MPSTREAM_H_INCLUDED
+#define TARANTOOL_LIB_CORE_MPSTREAM_H_INCLUDED
 /*
  * Copyright 2010-2015, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -148,4 +148,4 @@ mpstream_memset(struct mpstream *stream, int c, uint32_t n);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_MPSTREAM_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_MPSTREAM_H_INCLUDED */
diff --git a/src/lib/core/port.h b/src/lib/core/port.h
index 9266ae5f37f1685cc3f5faadab63ef9f01474716..8ace40fc53c4432e8d0be21f69cf698b7383bac6 100644
--- a/src/lib/core/port.h
+++ b/src/lib/core/port.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_PORT_H
-#define INCLUDES_TARANTOOL_PORT_H
+#ifndef TARANTOOL_LIB_CORE_PORT_H_INCLUDED
+#define TARANTOOL_LIB_CORE_PORT_H_INCLUDED
 /*
  * Copyright 2010-2018, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -124,4 +124,4 @@ port_dump_plain(struct port *port, uint32_t *size)
 } /* extern "C" */
 #endif /* defined __cplusplus */
 
-#endif /* INCLUDES_TARANTOOL_PORT_H */
+#endif /* TARANTOOL_LIB_CORE_PORT_H_INCLUDED */
diff --git a/src/lib/core/random.h b/src/lib/core/random.h
index cf24f9c41a21d3209d59b615dd37fc3952537055..26109b14b29b0e21b80958de2be37e191299e6c1 100644
--- a/src/lib/core/random.h
+++ b/src/lib/core/random.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_RANDOM_H
-#define INCLUDES_TARANTOOL_RANDOM_H
+#ifndef TARANTOOL_LIB_CORE_RANDOM_H_INCLUDED
+#define TARANTOOL_LIB_CORE_RANDOM_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -48,4 +48,4 @@ random_bytes(char *buf, size_t size);
 #if defined(__cplusplus)
 }
 #endif /* extern "C" */
-#endif /* INCLUDES_TARANTOOL_RANDOM_H */
+#endif /* TARANTOOL_LIB_CORE_RANDOM_H_INCLUDED */
diff --git a/src/lib/core/ratelimit.h b/src/lib/core/ratelimit.h
index 2bf0bac7b57eb176778ec7b4f6dbe67c1420cc18..91be44df0c85d6c1e97ae080f39adc637565a992 100644
--- a/src/lib/core/ratelimit.h
+++ b/src/lib/core/ratelimit.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_RATELIMIT_H_INCLUDED
-#define TARANTOOL_RATELIMIT_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_RATELIMIT_H_INCLUDED
+#define TARANTOOL_LIB_CORE_RATELIMIT_H_INCLUDED
 /*
  * Copyright 2010-2018, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -101,4 +101,4 @@ ratelimit_check(struct ratelimit *rl, double now, int *suppressed)
 } /* extern "C" */
 #endif
 
-#endif /* TARANTOOL_RATELIMIT_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_RATELIMIT_H_INCLUDED */
diff --git a/src/lib/core/reflection.h b/src/lib/core/reflection.h
index 45921c4eaf779bf18c8fc59d4350a53863c54920..8845726d4f523b7636ad887d710cfd499a133eb5 100644
--- a/src/lib/core/reflection.h
+++ b/src/lib/core/reflection.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_REFLECTION_H_INCLUDED
-#define TARANTOOL_REFLECTION_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_REFLECTION_H_INCLUDED
+#define TARANTOOL_LIB_CORE_REFLECTION_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -276,4 +276,4 @@ method_invoke(const struct method_info *method, T *object, Args... args)
 
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_REFLECTION_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_REFLECTION_H_INCLUDED */
diff --git a/src/lib/core/say.h b/src/lib/core/say.h
index 26db95133c913655cec356f621aa59f3019bc4e4..70050362c3ea3d7dbc276749db29fbb8013870f3 100644
--- a/src/lib/core/say.h
+++ b/src/lib/core/say.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_SAY_H_INCLUDED
-#define TARANTOOL_SAY_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_SAY_H_INCLUDED
+#define TARANTOOL_LIB_CORE_SAY_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -480,4 +480,4 @@ say_format_plain(struct log *log, char *buf, int len, int level,
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_SAY_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_SAY_H_INCLUDED */
diff --git a/src/lib/core/sio.h b/src/lib/core/sio.h
index 27988a232c3f232b34ceba575034ff8dd81b0b38..7e5c52afe7cffa2bfedc2e2033443a24d3b86eb0 100644
--- a/src/lib/core/sio.h
+++ b/src/lib/core/sio.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_SIO_H_INCLUDED
-#define TARANTOOL_SIO_H_INCLUDED
+#ifndef TARANTOOL_LIB_CORE_SIO_H_INCLUDED
+#define TARANTOOL_LIB_CORE_SIO_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -214,4 +214,4 @@ sio_uri_to_addr(const char *uri, struct sockaddr *addr);
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_SIO_H_INCLUDED */
+#endif /* TARANTOOL_LIB_CORE_SIO_H_INCLUDED */
diff --git a/src/lib/core/trigger.h b/src/lib/core/trigger.h
index fbdf60a1874b717d7ab521f13c637b00b07b15d4..d3ffb9a845c781e46337af62f24a179ff6f66846 100644
--- a/src/lib/core/trigger.h
+++ b/src/lib/core/trigger.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_TRIGGER_H
-#define INCLUDES_TARANTOOL_TRIGGER_H
+#ifndef TARANTOOL_LIB_CORE_TRIGGER_H_INCLUDED
+#define TARANTOOL_LIB_CORE_TRIGGER_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -130,4 +130,4 @@ trigger_run_xc(struct rlist *list, void *event)
 
 #endif /* defined(__cplusplus) */
 
-#endif /* INCLUDES_TARANTOOL_TRIGGER_H */
+#endif /* TARANTOOL_LIB_CORE_TRIGGER_H_INCLUDED */
diff --git a/src/lib/csv/csv.h b/src/lib/csv/csv.h
index 10fcb14fe607b3b915f7018dffc00bdce80c2838..fb5a111d1c8de8990cfd1320c631cc0149cd1c03 100644
--- a/src/lib/csv/csv.h
+++ b/src/lib/csv/csv.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_CSV_H_INCLUDED
-#define TARANTOOL_CSV_H_INCLUDED
+#ifndef TARANTOOL_LIB_CSV_CSV_H_INCLUDED
+#define TARANTOOL_LIB_CSV_CSV_H_INCLUDED
 /*
  * Copyright 2010-2016 Tarantool AUTHORS: please see AUTHORS file.
  *
@@ -179,5 +179,5 @@ csv_iterator_get_field_len(struct csv_iterator *it)
 #if defined(__cplusplus)
 }
 #endif /* extern "C" */
-#endif
+#endif /* TARANTOOL_LIB_CSV_CSV_H_INCLUDED */
 
diff --git a/src/lib/http_parser/http_parser.c b/src/lib/http_parser/http_parser.c
index e70f961645d08ea57895d5c87dcacafd67273dcf..b9490117e46bea72a22846f3c960af958f998fec 100644
--- a/src/lib/http_parser/http_parser.c
+++ b/src/lib/http_parser/http_parser.c
@@ -28,9 +28,8 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#include <string.h>
 #include "http_parser.h"
+#include <string.h>
 
 #define LF     (unsigned char) '\n'
 #define CR     (unsigned char) '\r'
diff --git a/src/lib/http_parser/http_parser.h b/src/lib/http_parser/http_parser.h
index 7a37ad3f49bff20b22da46ed0440d99820254bee..9d6cc0932c4bcf669ff1472193b72bc901acf775 100644
--- a/src/lib/http_parser/http_parser.h
+++ b/src/lib/http_parser/http_parser.h
@@ -1,3 +1,5 @@
+#ifndef TARANTOOL_LIB_HTTP_PARSER_HTTP_PARSER_H_INCLUDED
+#define TARANTOOL_LIB_HTTP_PARSER_HTTP_PARSER_H_INCLUDED
 /*
  * Copyright 2010-2017, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -29,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef TARANTOOL_HTTP_PARSER_H
-#define TARANTOOL_HTTP_PARSER_H
-
-#define HEADER_NAME_LEN 32
-
 enum {
 	HTTP_PARSE_OK,
 	HTTP_PARSE_CONTINUE,
@@ -58,11 +55,11 @@ struct http_parser {
  * @param bufp pointer to buffer with data
  * @param end_buf
  * @return	HTTP_DONE - line was parsed
- * 		HTTP_OK - header was read
- * 		HTTP_PARSE_INVALID - error during parsing
+ *		HTTP_OK - header was read
+ *		HTTP_PARSE_INVALID - error during parsing
  */
 int
 http_parse_header_line(struct http_parser *prsr, char **bufp,
 		       const char *end_buf, int max_hname_len);
 
-#endif //TARANTOOL_HTTP_PARSER_H
+#endif /* TARANTOOL_LIB_HTTP_PARSER_HTTP_PARSER_H_INCLUDED */
diff --git a/src/lib/info/info.h b/src/lib/info/info.h
index cafa425e91cbe6516750b2067f95d064ef435ba5..75b79712f3f618e4ad0d18094d6fb870326d8bf6 100644
--- a/src/lib/info/info.h
+++ b/src/lib/info/info.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_INFO_H
-#define INCLUDES_TARANTOOL_INFO_H
+#ifndef INCLUDES_TARANTOOL_LIB_INFO_INFO_H
+#define INCLUDES_TARANTOOL_LIB_INFO_INFO_H
 /*
  * Copyright 2010-2017, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -188,4 +188,4 @@ info_table_end(struct info_handler *info)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* INCLUDES_TARANTOOL_INFO_H */
+#endif /* INCLUDES_TARANTOOL_LIB_INFO_INFO_H */
diff --git a/src/lib/json/json.h b/src/lib/json/json.h
index 66cddd026e4c239c7de6c5b4cbe77c3458a5944a..6927d2d90e964e902df0d83852cd114ee79b71d6 100644
--- a/src/lib/json/json.h
+++ b/src/lib/json/json.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_JSON_JSON_H_INCLUDED
-#define TARANTOOL_JSON_JSON_H_INCLUDED
+#ifndef TARANTOOL_LIB_JSON_JSON_H_INCLUDED
+#define TARANTOOL_LIB_JSON_JSON_H_INCLUDED
 /*
  * Copyright 2010-2018 Tarantool AUTHORS: please see AUTHORS file.
  *
diff --git a/src/lib/salad/bloom.h b/src/lib/salad/bloom.h
index c5f9e02985361a4f1d97dde2bbaad2fa513a6a54..0105b5c1e6001ff06d4ed27a9fa7d5f36e0b44ff 100644
--- a/src/lib/salad/bloom.h
+++ b/src/lib/salad/bloom.h
@@ -1,7 +1,7 @@
-#ifndef TARANTOOL_BLOOM_H_INCLUDED
-#define TARANTOOL_BLOOM_H_INCLUDED
+#ifndef TARANTOOL_LIB_SALAD_BLOOM_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_BLOOM_H_INCLUDED
 /*
- * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
+ * Copyright 2010-2019, Tarantool AUTHORS, please see AUTHORS file.
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -210,4 +210,4 @@ bloom_maybe_has(const struct bloom *bloom, bloom_hash_t hash)
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_BLOOM_H_INCLUDED */
+#endif /* TARANTOOL_LIB_SALAD_BLOOM_H_INCLUDED */
diff --git a/src/lib/salad/fifo.h b/src/lib/salad/fifo.h
index 6561b20dd41ad88b23c253d8b3d89681fdbc7338..daad2d7da2c133e9c6ddc5561c3727a2cb6dd543 100644
--- a/src/lib/salad/fifo.h
+++ b/src/lib/salad/fifo.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_FIFO_H_INCLUDED
-#define TARANTOOL_FIFO_H_INCLUDED
+#ifndef TARANTOOL_LIB_SALAD_FIFO_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_FIFO_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -107,4 +107,4 @@ fifo_pop(struct fifo *q) {
 
 #undef FIFO_WATERMARK
 
-#endif /* TARANTOOL_FIFO_H_INCLUDED */
+#endif /* TARANTOOL_LIB_SALAD_FIFO_H_INCLUDED */
diff --git a/src/lib/salad/guava.c b/src/lib/salad/guava.c
index 0bfadc2897fd3d6e9ee9ca7d1190dae24b1d3d0e..46bf1ac1506006c46efa5957f383147ba1146afd 100644
--- a/src/lib/salad/guava.c
+++ b/src/lib/salad/guava.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
+ * Copyright 2010-2019, Tarantool AUTHORS, please see AUTHORS file.
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include "lib/salad/guava.h"
+#include "guava.h"
 
 #include <stdint.h>
 
diff --git a/src/lib/salad/guava.h b/src/lib/salad/guava.h
index df6b6e6d43ebce999b2f6e1a25899b9f237e2ff9..9ed93d641b8937b190641b6f572fa5a4fa901144 100644
--- a/src/lib/salad/guava.h
+++ b/src/lib/salad/guava.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_LIB_GUAVA_H_INCLUDED
-#define TARANTOOL_LIB_GUAVA_H_INCLUDED
+#ifndef TARANTOOL_LIB_SALAD_GUAVA_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_GUAVA_H_INCLUDED
 
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
@@ -45,4 +45,4 @@ guava(int64_t state, int32_t buckets);
 } /* extern C */
 #endif
 
-#endif /* TARANTOOL_LIB_GUAVA_H_INCLUDED */
+#endif /* TARANTOOL_LIB_SALAD_GUAVA_H_INCLUDED */
diff --git a/src/lib/salad/light.h b/src/lib/salad/light.h
index a3fc9095a9f9f7c003d177638dc2897de35cff00..01d59260c6de8910c7db8773df670657c2b0e4f2 100644
--- a/src/lib/salad/light.h
+++ b/src/lib/salad/light.h
@@ -32,7 +32,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #include "small/matras.h"
 
 /**
diff --git a/src/lib/salad/rope.h b/src/lib/salad/rope.h
index 719fd9c992a9d88c5c3e497a56c89a396a42cc93..c19f0e319d319c4f17c340c18b0adabd05d268bb 100644
--- a/src/lib/salad/rope.h
+++ b/src/lib/salad/rope.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_ROPE_H
-#define INCLUDES_TARANTOOL_ROPE_H
+#ifndef TARANTOOL_LIB_SALAD_ROPE_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_ROPE_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -269,4 +269,4 @@ rope_pretty_print(struct rope *rope, void (*print_leaf)(void *, size_t));
 }
 #endif /* defined(__cplusplus) */
 
-#endif /* INCLUDES_TARANTOOL_ROPE_H */
+#endif /* TARANTOOL_LIB_SALAD_ROPE_H_INCLUDED */
diff --git a/src/lib/salad/rtree.h b/src/lib/salad/rtree.h
index 2ce474fdc346b6a92f70a70c2db691741318e6aa..995bbf502f6282d4be2386b5b28cd8ebac94337d 100644
--- a/src/lib/salad/rtree.h
+++ b/src/lib/salad/rtree.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDES_TARANTOOL_SALAD_RTREE_H
-#define INCLUDES_TARANTOOL_SALAD_RTREE_H
+#ifndef TARANTOOL_LIB_SALAD_RTREE_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_RTREE_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -337,4 +337,4 @@ rtree_iterator_next(struct rtree_iterator *itr);
 } /* extern "C" { */
 #endif /* defined(__cplusplus) */
 
-#endif /* #ifndef INCLUDES_TARANTOOL_SALAD_RTREE_H */
+#endif /* #ifndef TARANTOOL_LIB_SALAD_RTREE_H_INCLUDED */
diff --git a/src/lib/salad/stailq.h b/src/lib/salad/stailq.h
index 0d53369eb8e9a7a7edb95f742e5bb0123b99b01f..d29aee94ac19c3ce0a08310cc17474d9318917e7 100644
--- a/src/lib/salad/stailq.h
+++ b/src/lib/salad/stailq.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_STAILQ_H_INCLUDED
-#define TARANTOOL_STAILQ_H_INCLUDED
+#ifndef TARANTOOL_LIB_SALAD_STAILQ_H_INCLUDED
+#define TARANTOOL_LIB_SALAD_STAILQ_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -262,4 +262,4 @@ stailq_cut_tail(struct stailq *head, struct stailq_entry *last,
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
-#endif /* TARANTOOL_STAILQ_H_INCLUDED */
+#endif /* TARANTOOL_LIB_SALAD_STAILQ_H_INCLUDED */
diff --git a/src/lib/uuid/tt_uuid.h b/src/lib/uuid/tt_uuid.h
index 00d6de662a924d503670fd1ad63cb1d8b64d32e7..48cd68e696d33296a74516b157f6ddfa816ddf5c 100644
--- a/src/lib/uuid/tt_uuid.h
+++ b/src/lib/uuid/tt_uuid.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_UUID_H_INCLUDED
-#define TARANTOOL_UUID_H_INCLUDED
+#ifndef TARANTOOL_LIB_UUID_UUID_H_INCLUDED
+#define TARANTOOL_LIB_UUID_UUID_H_INCLUDED
 /*
  * Copyright 2010-2016, Tarantool AUTHORS, please see AUTHORS file.
  *
@@ -183,4 +183,4 @@ tt_uuid_from_strl(const char *in, size_t len, struct tt_uuid *uu);
 } /* extern "C" */
 #endif
 
-#endif /* TARANTOOL_UUID_H_INCLUDED */
+#endif /* TARANTOOL_LIB_UUID_UUID_H_INCLUDED */
diff --git a/src/lua/httpc.c b/src/lua/httpc.c
index 7338799ca0ee28ba69e9c13057b24be6703a2ffe..3a48cb31a40eb746bbce6e1e85ece4eb6e588eb7 100644
--- a/src/lua/httpc.c
+++ b/src/lua/httpc.c
@@ -138,6 +138,8 @@ parse_headers(lua_State *L, char *buffer, size_t len,
 /** lib Lua API {{{
  */
 
+enum { MAX_HTTP_HEADER_NAME_LEN = 32 };
+
 static int
 luaT_httpc_request(lua_State *L)
 {
@@ -153,7 +155,7 @@ luaT_httpc_request(lua_State *L)
 		return luaT_error(L);
 
 	double timeout = TIMEOUT_INFINITY;
-	int max_header_name_length = HEADER_NAME_LEN;
+	int max_header_name_length = MAX_HTTP_HEADER_NAME_LEN;
 	if (lua_isstring(L, 4)) {
 		size_t len = 0;
 		const char *body = lua_tolstring(L, 4, &len);