diff --git a/source/Makefile.mk b/source/Makefile.mk
index 4a2791174..2f4cc7a5e 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -269,6 +269,11 @@ LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -Wno-unused-param
 LINUXSAMPLER_LIBS  = $(shell pkg-config --libs linuxsampler)
 endif
 
+ifeq ($(HAVE_X11),true)
+X11_FLAGS = $(shell pkg-config --cflags x11)
+X11_LIBS  = $(shell pkg-config --libs x11)
+endif
+
 ifneq ($(HAIKU),true)
 RTMEMPOOL_LIBS = -lpthread
 endif
diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile
index 71a285ccd..de2fc4025 100644
--- a/source/backend/standalone/Makefile
+++ b/source/backend/standalone/Makefile
@@ -66,15 +66,22 @@ STATIC_LIBS += ../../modules/lilv.a
 LINK_FLAGS  += $(LILV_LIBS)
 endif
 
-ifeq ($(CARLA_CSOUND_SUPPORT),true)
-LINK_FLAGS  += $(CSOUND_LIBS)
+ifeq ($(HAVE_CSOUND),true)
+LINK_FLAGS += $(CSOUND_LIBS)
 endif
 
-ifeq ($(CARLA_SAMPLERS_SUPPORT),true)
+ifeq ($(HAVE_FLUIDSYNTH),true)
 LINK_FLAGS += $(FLUIDSYNTH_LIBS)
+endif
+
+ifeq ($(HAVE_LINUXSAMPLER),true)
 LINK_FLAGS += $(LINUXSAMPLER_LIBS)
 endif
 
+ifeq ($(HAVE_X11),true)
+LINK_FLAGS += $(X11_LIBS)
+endif
+
 # ----------------------------------------------------------------------------------------------------------------------------
 # Native