diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp
index f0b9af189..04a4df2bf 100644
--- a/uppsrc/Core/Core.upp
+++ b/uppsrc/Core/Core.upp
@@ -25,10 +25,6 @@ static_library(ANDROID) cpufeatures;
 
 link(GCC POSIX STACKTRACE) -rdynamic;
 
-link(LINUX !SHARED) "-nodefaultlibs -Wl,-shared -l c -Wl,-static";
-
-link(LINUX SHARED) "-Wl,-static -Wl,--start-group -lfreetype -lfontconfig -lfreetype -lX11 -lxcb -lexpat -lpng16 -lfreetype -lX11 -lXinerama -lXrender -lXdmcp -lXau -lxcb -lXext -lbrotlidec -lbrotlicommon -lpng16 -lbz2 -lXft -lpthread -ldl -lrt -lz -Wl,--end-group -Wl,-shared";
-
 file
 	Core.h options(BUILDER_OPTION) PCH,
 	config.h,
diff --git a/uppsrc/CtrlCore/CtrlCore.upp b/uppsrc/CtrlCore/CtrlCore.upp
index bc0456e80..ff7f88402 100644
--- a/uppsrc/CtrlCore/CtrlCore.upp
+++ b/uppsrc/CtrlCore/CtrlCore.upp
@@ -8,9 +8,9 @@ uses
 
 library(WIN32) "advapi32 comdlg32 comctl32 imm32";
 
-library(POSIX !OSX !VIRTUALGUI !SO X11) "freetype X11 Xinerama Xrender Xdmcp Xau xcb Xext brotlidec brotlicommon png16 bz2 Xft";
+library(POSIX !OSX !VIRTUALGUI X11) "/lib/x86_64-linux-gnu/libX11.a /lib/x86_64-linux-gnu/libfreetype.a X11 Xinerama Xrender Xdmcp Xau xcb Xext brotlidec brotlicommon png16 bz2 Xft";
 
-pkg_config(POSIX !OSX !VIRTUALGUI SO) "freetype2 x11 xinerama xrender xft xdmcp fontconfig xcb xext";
+pkg_config(POSIX !OSX !VIRTUALGUI SO) "xinerama xrender xft xdmcp fontconfig xcb xext";
 
 pkg_config(POSIX !X11 !OSX !VIRTUALGUI) "gtk+-3.0 libnotify";
 
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index 37231c805..2321e120a 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -13,9 +13,9 @@ library(WIN32) "usp10 user32 gdi32";
 
 link(OSX !X11 !NOMM) "-framework Foundation -framework Cocoa -framework Carbon";
 
-pkg_config(POSIX !OSX !SO) "freetype2 fontconfig";
+pkg_config(POSIX !OSX !SO) fontconfig;
 
-pkg_config(POSIX !OSX !VIRTUALGUI !SO) "x11 xcb expat";
+pkg_config(POSIX !OSX !VIRTUALGUI !SO) "xcb expat";
 
 file
 	Draw.h options(BUILDER_OPTION) PCH,