diff --git a/src/plugins_types/lyds_tree.c b/src/plugins_types/lyds_tree.c
index d1c88f6..4dc73fb 100644
--- a/src/plugins_types/lyds_tree.c
+++ b/src/plugins_types/lyds_tree.c
@@ -18,9 +18,9 @@
 #include <stddef.h> /* NULL */
 #include <string.h> /* memset */
 
-#include "common.h"
 #include "compat.h"
 #include "libyang.h"
+#include "ly_common.h"
 #include "tree_data_sorted.h"
 
 static void lyplg_type_free_lyds(const struct ly_ctx *ctx, struct lyd_value *value);
diff --git a/src/tree_data_sorted.c b/src/tree_data_sorted.c
index 05bd471..445640f 100644
--- a/src/tree_data_sorted.c
+++ b/src/tree_data_sorted.c
@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
 #include "dict.h"
 #include "log.h"
+#include "ly_common.h"
 #include "metadata.h"
 #include "plugins_internal.h"
 #include "plugins_types.h"
diff --git a/tests/utests/data/test_tree_data_sorted.c b/tests/utests/data/test_tree_data_sorted.c
index 026e82e..0e812e7 100644
--- a/tests/utests/data/test_tree_data_sorted.c
+++ b/tests/utests/data/test_tree_data_sorted.c
@@ -14,8 +14,8 @@
 #define _UTEST_MAIN_
 #include "utests.h"
 
-#include "common.h"
 #include "libyang.h"
+#include "ly_common.h"
 #include "tree_data_internal.h"
 #include "tree_data_sorted.h"