diff --git a/3party/harfbuzz/CMakeLists.txt b/3party/harfbuzz/CMakeLists.txt
index 9a206986db..3a6e14e828 100644
--- a/3party/harfbuzz/CMakeLists.txt
+++ b/3party/harfbuzz/CMakeLists.txt
@@ -36,3 +36,5 @@ target_compile_definitions(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
+
+add_library(harfbuzz::harfbuzz ALIAS harfbuzz)
diff --git a/drape/CMakeLists.txt b/drape/CMakeLists.txt
index dae17fa7dd..1ccbb923a1 100644
--- a/drape/CMakeLists.txt
+++ b/drape/CMakeLists.txt
@@ -174,7 +174,7 @@ target_link_libraries(${PROJECT_NAME}
   Freetype::Freetype
   vulkan_wrapper
   stb_image
-  harfbuzz
+  harfbuzz::harfbuzz
   ICU::i18n
   expat::expat
   $<$<BOOL:${PLATFORM_MAC}>:-framework\ OpenGL>
diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/drape/drape_tests/glyph_mng_tests.cpp
index c5428eb063..3844fd1be5 100644
--- a/drape/drape_tests/glyph_mng_tests.cpp
+++ b/drape/drape_tests/glyph_mng_tests.cpp
@@ -13,14 +13,14 @@
 
 #include <QtGui/QPainter>
 
-#include <ft2build.h>
 #include <functional>
 #include <iostream>
 #include <vector>
+
+#include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_MODULE_H
-#include <harfbuzz/hb-ft.h>
-#include <harfbuzz/hb.h>
+#include <hb-ft.h>
 
 namespace glyph_mng_tests
 {
diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp
index e61cedec10..0e1e29877d 100644
--- a/drape/glyph_manager.cpp
+++ b/drape/glyph_manager.cpp
@@ -16,15 +16,8 @@
 #include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
-#include "std/target_os.hpp"
-
 #include <ft2build.h>
-// A system dependency is used on these platforms. TODO(AB): There should be a way to build everything from sources.
-#if defined(OMIM_OS_LINUX) || defined(OMIM_OS_WINDOWS)
-#include <harfbuzz/hb-ft.h>
-#else
 #include <hb-ft.h>
-#endif
 
 #include <limits>
 #include <sstream>
diff --git a/drape/harfbuzz_shaping.hpp b/drape/harfbuzz_shaping.hpp
index 31c35a2a9a..1f3e5a69c9 100644
--- a/drape/harfbuzz_shaping.hpp
+++ b/drape/harfbuzz_shaping.hpp
@@ -1,15 +1,9 @@
 #pragma once
 
-#include "std/target_os.hpp"
-
 #include <string>
 #include <vector>
 
-#if defined(OMIM_OS_LINUX) || defined(OMIM_OS_WINDOWS)
-#include <harfbuzz/hb.h>
-#else
 #include <hb.h>
-#endif
 
 namespace harfbuzz_shaping
 {