diff --git a/Common/base.pri b/Common/base.pri
index 78f2e36afe..be5776332d 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -309,3 +309,17 @@ core_ios {
         }
     }
 }
+
+defineTest(ADD_DEPENDENCY) {
+    libs = $$ARGS
+    for(lib, libs) {
+        CORE_BUILDS_LIBRARIES_PATH_DST=$$CORE_BUILDS_LIBRARIES_PATH
+        build_xp {
+            isEqual(lib, doctrenderer):CORE_BUILDS_LIBRARIES_PATH_DST=$$CORE_BUILDS_LIBRARIES_PATH/xp
+        }
+        !bundle_dylibs:LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH_DST -l$$lib
+        bundle_dylibs:LIBS += -F$$CORE_BUILDS_LIBRARIES_PATH_DST -framework $$lib
+    }
+    export(LIBS)
+}
+
diff --git a/DesktopEditor/AllFontsGen/AllFontsGen.pro b/DesktopEditor/AllFontsGen/AllFontsGen.pro
index 9dbccbd5a5..245103df8c 100644
--- a/DesktopEditor/AllFontsGen/AllFontsGen.pro
+++ b/DesktopEditor/AllFontsGen/AllFontsGen.pro
@@ -15,7 +15,7 @@ TARGET = allfontsgen
 
 DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
 DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics -lkernel -lUnicodeConverter
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
 
 core_windows {
     DEFINES += \
diff --git a/DesktopEditor/allthemesgen/allthemesgen.pro b/DesktopEditor/allthemesgen/allthemesgen.pro
index 65a47897d7..664144457b 100644
--- a/DesktopEditor/allthemesgen/allthemesgen.pro
+++ b/DesktopEditor/allthemesgen/allthemesgen.pro
@@ -15,13 +15,7 @@ TARGET = allthemesgen
 
 DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
 DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics -lkernel -lUnicodeConverter
-
-build_xp {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
-} else {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
-}
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, doctrenderer)
 
 core_windows {
     DEFINES -= UNICODE
diff --git a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
index d6f7df0a50..c96431127f 100644
--- a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
+++ b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
@@ -45,13 +45,7 @@ core_windows {
 DESTDIR = $$CORE_BUILDS_BINARY_PATH
 ################################################
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics -lUnicodeConverter
-
-build_xp {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
-} else {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
-}
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, doctrenderer)
 
 core_linux {
     LIBS += -ldl
diff --git a/DesktopEditor/doctrenderer/doctrenderer.pro b/DesktopEditor/doctrenderer/doctrenderer.pro
index 0819c50bf9..daf1900bc9 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.pro
+++ b/DesktopEditor/doctrenderer/doctrenderer.pro
@@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD
 include(../../Common/base.pri)
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
 
 #CONFIG += build_xp
 
diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro
index 473b4a03d1..efe07df2dd 100644
--- a/DesktopEditor/graphics/pro/graphics.pro
+++ b/DesktopEditor/graphics/pro/graphics.pro
@@ -19,7 +19,7 @@ CORE_ROOT_DIR = $$PWD/../../..
 PWD_ROOT_DIR = $$PWD
 include(../../../Common/base.pri)
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel
+ADD_DEPENDENCY(UnicodeConverter, kernel)
 
 DEFINES += \
     _QT \
diff --git a/DesktopEditor/xmlsec/src/ooxmlsignature.pro b/DesktopEditor/xmlsec/src/ooxmlsignature.pro
index c44ada610b..0afe6454ca 100644
--- a/DesktopEditor/xmlsec/src/ooxmlsignature.pro
+++ b/DesktopEditor/xmlsec/src/ooxmlsignature.pro
@@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/../../..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel
+ADD_DEPENDENCY(kernel)
 
 DEFINES -= UNICODE
 
diff --git a/DjVuFile/DjVuFile.pro b/DjVuFile/DjVuFile.pro
index 7dfe19f87e..1d718869a5 100644
--- a/DjVuFile/DjVuFile.pro
+++ b/DjVuFile/DjVuFile.pro
@@ -15,9 +15,7 @@ CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter -lUnicodeConverter
-
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter)
 
 DEFINES -= \
     UNICODE \
diff --git a/HtmlFile/HtmlFile.pro b/HtmlFile/HtmlFile.pro
index 0487b04c44..6434fa5e0c 100644
--- a/HtmlFile/HtmlFile.pro
+++ b/HtmlFile/HtmlFile.pro
@@ -16,7 +16,7 @@ CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel
+ADD_DEPENDENCY(kernel, UnicodeConverter)
 
 core_linux {
     DEFINES += asc_static_link_libstd
diff --git a/HtmlRenderer/htmlrenderer.pro b/HtmlRenderer/htmlrenderer.pro
index c89d281ad6..b0beacc844 100644
--- a/HtmlRenderer/htmlrenderer.pro
+++ b/HtmlRenderer/htmlrenderer.pro
@@ -16,8 +16,7 @@ CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)
 
-#UnicodeConverter
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
 
 core_windows {
 LIBS += -lgdi32 \
diff --git a/PdfReader/PdfReader.pro b/PdfReader/PdfReader.pro
index b2fbefe912..a0e519f1b9 100644
--- a/PdfReader/PdfReader.pro
+++ b/PdfReader/PdfReader.pro
@@ -15,9 +15,8 @@ include(../Common/base.pri)
 
 DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
 DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, HtmlRenderer)
 
 DEFINES += CRYPTOPP_DISABLE_ASM
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib
diff --git a/PdfWriter/PdfWriter.pro b/PdfWriter/PdfWriter.pro
index 6db8509a26..2aab9b0009 100644
--- a/PdfWriter/PdfWriter.pro
+++ b/PdfWriter/PdfWriter.pro
@@ -15,7 +15,7 @@ include(../Common/base.pri)
 
 DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY
 
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter)
 
 DEFINES += CRYPTOPP_DISABLE_ASM
 LIBS += -lCryptoPPLib
diff --git a/X2tConverter/build/Qt/X2tConverter.pri b/X2tConverter/build/Qt/X2tConverter.pri
index 974accb3dd..b398010d93 100755
--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@@ -51,7 +51,6 @@ DEFINES += FILE_FORMAT_CHECKER_WITH_MACRO
 
 DEFINES += KERNEL_USE_DYNAMIC_LIBRARY
 DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
 
 INCLUDEPATH += $$PWD/../../../Common/DocxFormat
 DEPENDPATH += $$PWD/../../../Common/DocxFormat
@@ -92,32 +91,19 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPptFormatLib
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lRtfFormatLib
 #txt(xml) file
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lTxtXmlFormatLib
-# pdf writer
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
 #docxfile2
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lASCOfficeDocxFile2Lib
 #pptxformat
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPPTXFormatLib
 #docxformat
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDocxFormatLib
-#doctrenderer
-build_xp {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH/xp -ldoctrenderer
-} else {
-    LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
-}
-#HtmlRenderer
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDjVuFile
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXpsFile
-#HtmlFile
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlFile
-#UnicodeConverter
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter
+
 #Crypto++
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib
 
+#All dynamic libs
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter, PdfReader, HtmlFile, XpsFile, DjVuFile, HtmlRenderer, doctrenderer)
+
 #####################################################
 # внешнее подключение сторонних библиотек
 
diff --git a/XpsFile/XpsFile.pro b/XpsFile/XpsFile.pro
index 60cb01eca2..2be3d55f82 100644
--- a/XpsFile/XpsFile.pro
+++ b/XpsFile/XpsFile.pro
@@ -14,9 +14,7 @@ PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)
 
 DEFINES += XPS_USE_DYNAMIC_LIBRARY
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
-
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, PdfWriter)
 
 core_windows {
 LIBS += -lgdi32 \