[Tarantool-patches] [PATCH v2 02/11] uuid: move into libcore

[Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

libuuid used to be a separate library since
de11d68a48e397b555731be04ba695b2ba1a0ccf ("CMake: refactor
dependencies of internal libraries").

Unclear what was it done for. The commit says "fir unit tests".
But they perfectly fine can depend on libcore like many of them
do already.

Because of libuuid being a separate library, libcore can't use
tt_uuid, because that would be a cyclic dependency. And that won't
allow to introduce tt_uuid-dependent API in a next patch.

Hence libuuid is merged into libcore.

Needed for #5568
---
 src/CMakeLists.txt                      | 3 +--
 src/box/applier.h                       | 2 +-
 src/box/bind.h                          | 2 +-
 src/box/field_def.c                     | 4 ++--
 src/box/lua/serialize_lua.c             | 2 +-
 src/box/msgpack.c                       | 2 +-
 src/box/replication.h                   | 2 +-
 src/box/sql/mem.c                       | 2 +-
 src/box/sql/mem.h                       | 2 +-
 src/box/tuple.h                         | 2 +-
 src/box/tuple_compare.cc                | 8 ++++----
 src/box/xlog.h                          | 2 +-
 src/box/xrow.h                          | 2 +-
 src/lib/CMakeLists.txt                  | 1 -
 src/lib/core/CMakeLists.txt             | 2 ++
 src/lib/core/crash.c                    | 2 +-
 src/lib/{uuid => core}/mp_uuid.c        | 0
 src/lib/{uuid => core}/mp_uuid.h        | 0
 src/lib/{uuid => core}/tt_uuid.c        | 0
 src/lib/{uuid => core}/tt_uuid.h        | 0
 src/lib/mpstream/CMakeLists.txt         | 2 +-
 src/lib/mpstream/mpstream.c             | 2 +-
 src/lib/swim/CMakeLists.txt             | 2 +-
 src/lib/swim/swim_io.h                  | 2 +-
 src/lib/swim/swim_proto.h               | 2 +-
 src/lib/uuid/CMakeLists.txt             | 2 --
 src/lua/msgpack.c                       | 6 +++---
 src/lua/tnt_msgpuck.h                   | 2 +-
 src/lua/utils.c                         | 2 +-
 test/sql-tap/CMakeLists.txt             | 2 +-
 test/sql-tap/gh-6024-funcs-return-bin.c | 2 +-
 test/sql-tap/sql_uuid.c                 | 2 +-
 test/unit/CMakeLists.txt                | 2 +-
 test/unit/swim_proto.c                  | 2 +-
 test/unit/swim_test_utils.c             | 2 +-
 test/unit/swim_test_utils.h             | 2 +-
 test/unit/uuid.c                        | 4 ++--
 test/unit/vy_iterators_helper.c         | 2 +-
 test/unit/xrow.cc                       | 2 +-
 third_party/lua-cjson/lua_cjson.c       | 2 +-
 third_party/lua-yaml/lyaml.cc           | 2 +-
 41 files changed, 43 insertions(+), 45 deletions(-)
 rename src/lib/{uuid => core}/mp_uuid.c (100%)
 rename src/lib/{uuid => core}/mp_uuid.h (100%)
 rename src/lib/{uuid => core}/tt_uuid.c (100%)
 rename src/lib/{uuid => core}/tt_uuid.h (100%)
 delete mode 100644 src/lib/uuid/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 168ac2a52..2e20c06ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -190,7 +190,7 @@ endif()
 set_source_files_compile_flags(${server_sources})
 add_library(server STATIC ${server_sources})
 add_dependencies(server build_bundled_libs)
-target_link_libraries(server core coll http_parser bit uri uuid swim swim_udp
+target_link_libraries(server core coll http_parser bit uri swim swim_udp
                       swim_ev crypto mpstream crc32 tzcode)
 
 # Rule of thumb: if exporting a symbol from a static library, list the
@@ -220,7 +220,6 @@ if (TARGET_OS_FREEBSD AND NOT TARGET_OS_DEBIAN_FREEBSD)
     endif()
 endif()
 
-set (common_libraries ${common_libraries} ${LIBUUID_LIBRARIES})
 set (common_libraries ${common_libraries} PARENT_SCOPE)
 
 add_subdirectory(lib)
diff --git a/src/box/applier.h b/src/box/applier.h
index 15ca1fcfd..9a7497ba5 100644
--- a/src/box/applier.h
+++ b/src/box/applier.h
@@ -40,7 +40,7 @@
 #include "fiber_cond.h"
 #include "trigger.h"
 #include "trivia/util.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "uri/uri.h"
 
 #include "xrow.h"
diff --git a/src/box/bind.h b/src/box/bind.h
index 1ab8ea72d..45d390314 100644
--- a/src/box/bind.h
+++ b/src/box/bind.h
@@ -41,8 +41,8 @@ extern "C" {
 
 #include "msgpuck.h"
 #include "decimal.h"
-#include "uuid/tt_uuid.h"
 #include "mp_extension_types.h"
+#include "tt_uuid.h"
 
 struct sql_stmt;
 
diff --git a/src/box/field_def.c b/src/box/field_def.c
index 51acb8025..780729854 100644
--- a/src/box/field_def.c
+++ b/src/box/field_def.c
@@ -33,8 +33,8 @@
 #include "trivia/util.h"
 #include "key_def.h"
 #include "mp_extension_types.h"
-#include "uuid/mp_uuid.h"
-#include "uuid/tt_uuid.h"
+#include "mp_uuid.h"
+#include "tt_uuid.h"
 
 const char *mp_type_strs[] = {
 	/* .MP_NIL    = */ "nil",
diff --git a/src/box/lua/serialize_lua.c b/src/box/lua/serialize_lua.c
index 1f791980f..b3a7ea09a 100644
--- a/src/box/lua/serialize_lua.c
+++ b/src/box/lua/serialize_lua.c
@@ -39,7 +39,7 @@
 
 #include "lib/core/decimal.h"
 #include "mp_extension_types.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 
 #include "lua-yaml/b64.h"
 
diff --git a/src/box/msgpack.c b/src/box/msgpack.c
index 1723dea4c..06775c1fe 100644
--- a/src/box/msgpack.c
+++ b/src/box/msgpack.c
@@ -33,8 +33,8 @@
 
 #include "mp_extension_types.h"
 #include "mp_decimal.h"
-#include "uuid/mp_uuid.h"
 #include "mp_error.h"
+#include "mp_uuid.h"
 
 static int
 msgpack_fprint_ext(FILE *file, const char **data, int depth)
diff --git a/src/box/replication.h b/src/box/replication.h
index a8fed45e8..95563e811 100644
--- a/src/box/replication.h
+++ b/src/box/replication.h
@@ -30,7 +30,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "uuid/tt_uuid.h"
 #include "trigger.h"
 #include <stdint.h>
 #define RB_COMPACT 1
@@ -38,6 +37,7 @@
 #include <small/rlist.h>
 #include "applier.h"
 #include "fiber_cond.h"
+#include "tt_uuid.h"
 #include "vclock/vclock.h"
 #include "latch.h"
 
diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c
index dc629aee3..2d3a82122 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -43,8 +43,8 @@
 #include "lua/serializer.h"
 #include "lua/msgpack.h"
 #include "lua/decimal.h"
-#include "uuid/mp_uuid.h"
 #include "mp_decimal.h"
+#include "mp_uuid.h"
 
 #define CMP_OLD_NEW(a, b, type) (((a) > (type)(b)) - ((a) < (type)(b)))
 
diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h
index 242f910db..07d975163 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 #include "box/field_def.h"
-#include "uuid/tt_uuid.h"
 #include "decimal.h"
+#include "tt_uuid.h"
 
 struct sql;
 struct Vdbe;
diff --git a/src/box/tuple.h b/src/box/tuple.h
index 5d4a19a19..1278866c8 100644
--- a/src/box/tuple.h
+++ b/src/box/tuple.h
@@ -34,8 +34,8 @@
 #include "say.h"
 #include "diag.h"
 #include "error.h"
-#include "uuid/tt_uuid.h" /* tuple_field_uuid */
 #include "tt_static.h"
+#include "tt_uuid.h"
 #include "tuple_format.h"
 
 #if defined(__cplusplus)
diff --git a/src/box/tuple_compare.cc b/src/box/tuple_compare.cc
index 43cd29ce9..8acdd42bd 100644
--- a/src/box/tuple_compare.cc
+++ b/src/box/tuple_compare.cc
@@ -28,15 +28,15 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "decimal.h"
 #include "tuple_compare.h"
 #include "tuple.h"
 #include "coll/coll.h"
 #include "trivia/util.h" /* NOINLINE */
 #include <math.h>
-#include "lib/core/decimal.h"
-#include "lib/core/mp_decimal.h"
-#include "uuid/mp_uuid.h"
-#include "lib/core/mp_extension_types.h"
+#include "mp_decimal.h"
+#include "mp_extension_types.h"
+#include "mp_uuid.h"
 
 /* {{{ tuple_compare */
 
diff --git a/src/box/xlog.h b/src/box/xlog.h
index a8bc4a330..b525fd68e 100644
--- a/src/box/xlog.h
+++ b/src/box/xlog.h
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <sys/stat.h>
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "vclock/vclock.h"
 
 #define ZSTD_STATIC_LINKING_ONLY
diff --git a/src/box/xrow.h b/src/box/xrow.h
index 762b6e36b..6431f708f 100644
--- a/src/box/xrow.h
+++ b/src/box/xrow.h
@@ -35,9 +35,9 @@
 #include <stddef.h>
 #include <sys/uio.h> /* struct iovec */
 
-#include "uuid/tt_uuid.h"
 #include "diag.h"
 #include "iproto_features.h"
+#include "tt_uuid.h"
 #include "vclock/vclock.h"
 
 #if defined(__cplusplus)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 81ccc585d..b973dc501 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -8,7 +8,6 @@ add_subdirectory(json)
 add_subdirectory(uri)
 add_subdirectory(http_parser)
 add_subdirectory(core)
-add_subdirectory(uuid)
 add_subdirectory(coll)
 add_subdirectory(crypto)
 add_subdirectory(swim)
diff --git a/src/lib/core/CMakeLists.txt b/src/lib/core/CMakeLists.txt
index 0cc742a1c..fb640461d 100644
--- a/src/lib/core/CMakeLists.txt
+++ b/src/lib/core/CMakeLists.txt
@@ -31,6 +31,8 @@ set(core_sources
     mp_decimal.c
     cord_buf.c
     datetime.c
+    tt_uuid.c
+    mp_uuid.c
 )
 
 if (TARGET_OS_NETBSD)
diff --git a/src/lib/core/crash.c b/src/lib/core/crash.c
index abb7837e6..826c140b5 100644
--- a/src/lib/core/crash.c
+++ b/src/lib/core/crash.c
@@ -14,12 +14,12 @@
 
 #include "small/static.h"
 #include "trivia/util.h"
-#include "uuid/tt_uuid.h"
 
 #include "box/replication.h"
 #include "backtrace.h"
 #include "crash.h"
 #include "say.h"
+#include "tt_uuid.h"
 
 #define pr_fmt(fmt)		"crash: " fmt
 #define pr_debug(fmt, ...)	say_debug(pr_fmt(fmt), ##__VA_ARGS__)
diff --git a/src/lib/uuid/mp_uuid.c b/src/lib/core/mp_uuid.c
similarity index 100%
rename from src/lib/uuid/mp_uuid.c
rename to src/lib/core/mp_uuid.c
diff --git a/src/lib/uuid/mp_uuid.h b/src/lib/core/mp_uuid.h
similarity index 100%
rename from src/lib/uuid/mp_uuid.h
rename to src/lib/core/mp_uuid.h
diff --git a/src/lib/uuid/tt_uuid.c b/src/lib/core/tt_uuid.c
similarity index 100%
rename from src/lib/uuid/tt_uuid.c
rename to src/lib/core/tt_uuid.c
diff --git a/src/lib/uuid/tt_uuid.h b/src/lib/core/tt_uuid.h
similarity index 100%
rename from src/lib/uuid/tt_uuid.h
rename to src/lib/core/tt_uuid.h
diff --git a/src/lib/mpstream/CMakeLists.txt b/src/lib/mpstream/CMakeLists.txt
index 60ed20030..bd8dc9981 100644
--- a/src/lib/mpstream/CMakeLists.txt
+++ b/src/lib/mpstream/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_library(mpstream STATIC mpstream.c)
-target_link_libraries(mpstream core uuid ${MSGPUCK_LIBRARIES})
+target_link_libraries(mpstream core ${MSGPUCK_LIBRARIES})
diff --git a/src/lib/mpstream/mpstream.c b/src/lib/mpstream/mpstream.c
index 70ca29889..758bf5e55 100644
--- a/src/lib/mpstream/mpstream.c
+++ b/src/lib/mpstream/mpstream.c
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include "msgpuck.h"
 #include "mp_decimal.h"
-#include "uuid/mp_uuid.h"
+#include "mp_uuid.h"
 
 void
 mpstream_reserve_slow(struct mpstream *stream, size_t size)
diff --git a/src/lib/swim/CMakeLists.txt b/src/lib/swim/CMakeLists.txt
index 11202dce3..873cf6e5b 100644
--- a/src/lib/swim/CMakeLists.txt
+++ b/src/lib/swim/CMakeLists.txt
@@ -5,7 +5,7 @@ set(lib_swim_ev_sources swim_ev.c)
 set_source_files_compile_flags(${lib_swim_sources} ${lib_swim_udp_sources}
                                ${lib_swim_ev_sources})
 add_library(swim STATIC ${lib_swim_sources})
-target_link_libraries(swim core misc uuid crypto)
+target_link_libraries(swim core misc crypto)
 add_library(swim_udp STATIC ${lib_swim_udp_sources})
 target_link_libraries(swim_udp core)
 add_library(swim_ev STATIC ${lib_swim_ev_sources})
diff --git a/src/lib/swim/swim_io.h b/src/lib/swim/swim_io.h
index bf5a1389f..83c415541 100644
--- a/src/lib/swim/swim_io.h
+++ b/src/lib/swim/swim_io.h
@@ -36,7 +36,7 @@
 #include "crypto/crypto.h"
 #include "swim_transport.h"
 #include "tarantool_ev.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include <stdbool.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/src/lib/swim/swim_proto.h b/src/lib/swim/swim_proto.h
index 595606499..070f4b47b 100644
--- a/src/lib/swim/swim_proto.h
+++ b/src/lib/swim/swim_proto.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #include "tt_static.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
diff --git a/src/lib/uuid/CMakeLists.txt b/src/lib/uuid/CMakeLists.txt
deleted file mode 100644
index a3316647b..000000000
--- a/src/lib/uuid/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_library(uuid STATIC tt_uuid.c mp_uuid.c)
-target_link_libraries(uuid core bit)
diff --git a/src/lua/msgpack.c b/src/lua/msgpack.c
index 73a9eb074..1953fc407 100644
--- a/src/lua/msgpack.c
+++ b/src/lua/msgpack.c
@@ -42,10 +42,10 @@
 #include <small/region.h>
 #include <small/ibuf.h>
 
+#include "decimal.h" /* decimal_unpack() */
 #include "lua/decimal.h" /* lua_pushdecimal() */
-#include "lib/core/decimal.h" /* decimal_unpack() */
-#include "lib/uuid/mp_uuid.h" /* mp_decode_uuid() */
-#include "lib/core/mp_extension_types.h"
+#include "mp_extension_types.h"
+#include "mp_uuid.h" /* mp_decode_uuid() */
 
 #include "cord_buf.h"
 #include <fiber.h>
diff --git a/src/lua/tnt_msgpuck.h b/src/lua/tnt_msgpuck.h
index 2eb5dad8a..ac898a9c0 100644
--- a/src/lua/tnt_msgpuck.h
+++ b/src/lua/tnt_msgpuck.h
@@ -43,7 +43,7 @@ extern "C" {
 
 #include "mp_decimal.h"
 #include "box/mp_error.h"
-#include "uuid/mp_uuid.h"
+#include "mp_uuid.h"
 
 char *
 tnt_mp_encode_decimal(char *data, const decimal_t *dec);
diff --git a/src/lua/utils.c b/src/lua/utils.c
index 979716758..ae8fe468c 100644
--- a/src/lua/utils.c
+++ b/src/lua/utils.c
@@ -37,7 +37,7 @@
 #include <trivia/util.h>
 #include <diag.h>
 #include <fiber.h>
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 
 int luaL_nil_ref = LUA_REFNIL;
 
diff --git a/test/sql-tap/CMakeLists.txt b/test/sql-tap/CMakeLists.txt
index 74543becd..c4ec1214a 100644
--- a/test/sql-tap/CMakeLists.txt
+++ b/test/sql-tap/CMakeLists.txt
@@ -4,6 +4,6 @@ target_link_libraries(gh-5938-wrong-string-length msgpuck)
 build_module(gh-6024-funcs-return-bin gh-6024-funcs-return-bin.c)
 target_link_libraries(gh-6024-funcs-return-bin msgpuck)
 build_module(sql_uuid sql_uuid.c)
-target_link_libraries(sql_uuid msgpuck uuid)
+target_link_libraries(sql_uuid msgpuck core)
 build_module(decimal decimal.c)
 target_link_libraries(decimal msgpuck)
diff --git a/test/sql-tap/gh-6024-funcs-return-bin.c b/test/sql-tap/gh-6024-funcs-return-bin.c
index 3bcd67136..f05924337 100644
--- a/test/sql-tap/gh-6024-funcs-return-bin.c
+++ b/test/sql-tap/gh-6024-funcs-return-bin.c
@@ -1,8 +1,8 @@
 #include "msgpuck.h"
 #include "module.h"
-#include "uuid/mp_uuid.h"
 #include "mp_decimal.h"
 #include "lua/tnt_msgpuck.h"
+#include "mp_uuid.h"
 
 enum {
 	BUF_SIZE = 512,
diff --git a/test/sql-tap/sql_uuid.c b/test/sql-tap/sql_uuid.c
index 9debfb9d2..d681a4d6c 100644
--- a/test/sql-tap/sql_uuid.c
+++ b/test/sql-tap/sql_uuid.c
@@ -1,8 +1,8 @@
 #include "msgpuck.h"
 #include "module.h"
-#include "uuid/mp_uuid.h"
 #include "mp_extension_types.h"
 #include "lua/tnt_msgpuck.h"
+#include "mp_uuid.h"
 
 enum {
 	BUF_SIZE = 512,
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index ae8b5b9ac..10e1f4395 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -53,7 +53,7 @@ target_link_libraries(bitset_index.test bitset)
 add_executable(base64.test base64.c)
 target_link_libraries(base64.test misc unit)
 add_executable(uuid.test uuid.c core_test_utils.c)
-target_link_libraries(uuid.test uuid unit)
+target_link_libraries(uuid.test core unit)
 add_executable(random.test random.c core_test_utils.c)
 target_link_libraries(random.test core unit)
 add_executable(xmalloc.test xmalloc.c core_test_utils.c)
diff --git a/test/unit/swim_proto.c b/test/unit/swim_proto.c
index d7fafc7f0..6aab07d5a 100644
--- a/test/unit/swim_proto.c
+++ b/test/unit/swim_proto.c
@@ -31,7 +31,7 @@
 
 #include "memory.h"
 #include "fiber.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "version.h"
 #include "msgpuck.h"
 #include "unit.h"
diff --git a/test/unit/swim_test_utils.c b/test/unit/swim_test_utils.c
index 188ca5e5f..6badabcbd 100644
--- a/test/unit/swim_test_utils.c
+++ b/test/unit/swim_test_utils.c
@@ -30,7 +30,7 @@
  */
 #include "swim_test_utils.h"
 #include "swim/swim_ev.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "trivia/util.h"
 #include "msgpuck.h"
 #include "trigger.h"
diff --git a/test/unit/swim_test_utils.h b/test/unit/swim_test_utils.h
index 61a6787d9..4e5c1aec1 100644
--- a/test/unit/swim_test_utils.h
+++ b/test/unit/swim_test_utils.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #include <stdbool.h>
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "unit.h"
 #include "fiber.h"
 #include "uri/uri.h"
diff --git a/test/unit/uuid.c b/test/unit/uuid.c
index fdf263092..e58baa728 100644
--- a/test/unit/uuid.c
+++ b/test/unit/uuid.c
@@ -1,9 +1,9 @@
 #include "unit.h"
-#include "uuid/tt_uuid.h"
-#include "uuid/mp_uuid.h"
 #include "core/random.h"
+#include "mp_uuid.h"
 #include "msgpuck/msgpuck.h"
 #include "mp_extension_types.h"
+#include "tt_uuid.h"
 #include <string.h>
 
 static void
diff --git a/test/unit/vy_iterators_helper.c b/test/unit/vy_iterators_helper.c
index 0d20f19ef..63982bdb1 100644
--- a/test/unit/vy_iterators_helper.c
+++ b/test/unit/vy_iterators_helper.c
@@ -1,8 +1,8 @@
 #include "vy_iterators_helper.h"
 #include "memory.h"
 #include "fiber.h"
-#include "uuid/tt_uuid.h"
 #include "say.h"
+#include "tt_uuid.h"
 
 struct tt_uuid INSTANCE_UUID;
 
diff --git a/test/unit/xrow.cc b/test/unit/xrow.cc
index 2c0dd88b6..56a0ec3ef 100644
--- a/test/unit/xrow.cc
+++ b/test/unit/xrow.cc
@@ -35,7 +35,7 @@ extern "C" {
 #include "box/error.h"
 #include "box/xrow.h"
 #include "box/iproto_constants.h"
-#include "uuid/tt_uuid.h"
+#include "tt_uuid.h"
 #include "version.h"
 #include "random.h"
 #include "memory.h"
diff --git a/third_party/lua-cjson/lua_cjson.c b/third_party/lua-cjson/lua_cjson.c
index 6c4ec3736..67b97a0ce 100644
--- a/third_party/lua-cjson/lua_cjson.c
+++ b/third_party/lua-cjson/lua_cjson.c
@@ -52,8 +52,8 @@
 #include "mp_extension_types.h" /* MP_DECIMAL, MP_UUID */
 #include "diag.h"
 #include "tt_static.h"
-#include "uuid/tt_uuid.h" /* tt_uuid_to_string(), UUID_STR_LEN */
 #include "cord_buf.h"
+#include "tt_uuid.h" /* tt_uuid_to_string(), UUID_STR_LEN */
 
 typedef enum {
     T_OBJ_BEGIN,
diff --git a/third_party/lua-yaml/lyaml.cc b/third_party/lua-yaml/lyaml.cc
index a0e4de41f..59995f37c 100644
--- a/third_party/lua-yaml/lyaml.cc
+++ b/third_party/lua-yaml/lyaml.cc
@@ -54,7 +54,7 @@ extern "C" {
 #include "diag.h"
 #include "tt_static.h"
 #include "mp_extension_types.h" /* MP_DECIMAL, MP_UUID */
-#include "uuid/tt_uuid.h" /* tt_uuid_to_string(), UUID_STR_LEN */
+#include "tt_uuid.h" /* tt_uuid_to_string(), UUID_STR_LEN */
 
 #define LUAYAML_TAG_PREFIX "tag:yaml.org,2002:"
 
-- 
2.24.3 (Apple Git-128)