diff --git a/repos/gems/src/app/floating_window_layouter/target.mk b/repos/gems/src/app/floating_window_layouter/target.mk
index af9ad4b9cf..33e5edf850 100644
--- a/repos/gems/src/app/floating_window_layouter/target.mk
+++ b/repos/gems/src/app/floating_window_layouter/target.mk
@@ -1,4 +1,4 @@
 TARGET = floating_window_layouter
 SRC_CC = main.cc
-LIBS   = base cxx
+LIBS   = base
 
diff --git a/repos/libports/lib/mk/gallium-i915.mk b/repos/libports/lib/mk/gallium-i915.mk
index 2ad938f250..1b3cf4722d 100644
--- a/repos/libports/lib/mk/gallium-i915.mk
+++ b/repos/libports/lib/mk/gallium-i915.mk
@@ -26,7 +26,7 @@ INC_DIR += $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel
 SRC_C += $(notdir $(wildcard $(GALLIUM_SRC_DIR)/winsys/drm/intel/gem/*.c))
 vpath %.c $(GALLIUM_SRC_DIR)/winsys/drm/intel/gem
 
-LIBS += cxx libdrm
+LIBS += libdrm
 LIBS += gpu_i915_drv
 
 SHARED_LIB = yes
diff --git a/repos/libports/lib/mk/gallium.inc b/repos/libports/lib/mk/gallium.inc
index b858a729e9..b346e17406 100644
--- a/repos/libports/lib/mk/gallium.inc
+++ b/repos/libports/lib/mk/gallium.inc
@@ -1,7 +1,7 @@
 MESA_PORT_DIR   := $(call select_from_ports,mesa)
 GALLIUM_SRC_DIR := $(MESA_PORT_DIR)/src/lib/mesa/src/gallium
 
-LIBS += cxx libc libm mesa_host_tools
+LIBS += libc libm mesa_host_tools
 
 INC_DIR += $(GALLIUM_SRC_DIR)/include \
            $(GALLIUM_SRC_DIR)/auxiliary \
diff --git a/repos/libports/lib/mk/libdrm.mk b/repos/libports/lib/mk/libdrm.mk
index f8d96e887d..1b8ceb96c5 100644
--- a/repos/libports/lib/mk/libdrm.mk
+++ b/repos/libports/lib/mk/libdrm.mk
@@ -3,7 +3,7 @@ SRC_C = intel_bufmgr_gem.c intel_bufmgr.c ioctl.cc
 LIBDRM_DIR := $(call select_from_ports,libdrm)/src/lib/libdrm
 INC_DIR    += $(LIBDRM_DIR) $(LIBDRM_DIR)/include/drm $(LIBDRM_DIR)/intel
 
-LIBS   += libc cxx
+LIBS   += libc
 CC_OPT += -U__linux__
 CC_OPT += -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
diff --git a/repos/libports/lib/mk/mesa.inc b/repos/libports/lib/mk/mesa.inc
index 0c84260cab..74e1cef2d6 100644
--- a/repos/libports/lib/mk/mesa.inc
+++ b/repos/libports/lib/mk/mesa.inc
@@ -1,7 +1,7 @@
 MESA_PORT_DIR := $(call select_from_ports,mesa)
 MESA_SRC_DIR  := $(MESA_PORT_DIR)/src/lib/mesa/src/mesa
 
-LIBS += cxx libc libm mesa_host_tools
+LIBS += libc libm mesa_host_tools
 
 #
 # Prevent warning about non-existing 'fpu_control.h' included