diff --git a/x11/gnome/initial-setup/Makefile b/x11/gnome/initial-setup/Makefile
index 0ad739e6b7e..32221978b0b 100644
--- a/x11/gnome/initial-setup/Makefile
+++ b/x11/gnome/initial-setup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2017/05/11 08:13:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2017/05/11 20:27:07 espie Exp $
 
 COMMENT=		initial-setup firstboot-like tool
 
@@ -11,7 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm accountsservice
 WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
-WANTLIB += crack crypto dbus-1 dbus-glib-1 drm enchant epoxy estdc++
+WANTLIB += crack crypto dbus-1 dbus-glib-1 drm enchant epoxy ${LIBCXX}
 WANTLIB += expat ffi fontconfig freetype gbm gcrypt gdk-3 gdk_pixbuf-2.0
 WANTLIB += gdm geoclue-2 geocode-glib gio-2.0 glapi glib-2.0 gmodule-2.0
 WANTLIB += gnome-desktop-3 goa-1.0 goa-backend-1.0 gobject-2.0
diff --git a/x11/gnome/libgepub/Makefile b/x11/gnome/libgepub/Makefile
index 78e65dd0d82..ab80bcc7f8c 100644
--- a/x11/gnome/libgepub/Makefile
+++ b/x11/gnome/libgepub/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/04/13 07:38:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2017/05/11 20:27:07 espie Exp $
 
 # Required at build time for a temporary program created and run by
 # g-ir-scanner; programs linked against libgepub need wxneeded, too
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm archive
 WANTLIB += atk-1.0 atk-bridge-2.0 atspi bz2 cairo cairo-gobject
-WANTLIB += crypto dbus-1 drm enchant epoxy estdc++ expat ffi fontconfig
+WANTLIB += crypto dbus-1 drm enchant epoxy ${LIBCXX} expat ffi fontconfig
 WANTLIB += freetype gbm gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2
 WANTLIB += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
diff --git a/x11/gnome/online-accounts/Makefile b/x11/gnome/online-accounts/Makefile
index c82d9e1a7fe..02b1e7d547a 100644
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.92 2017/04/17 07:31:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.93 2017/05/11 20:27:07 espie Exp $
 
 COMMENT=	interfaces for interacting with online accounts
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0
 WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 dbus-glib-1
-WANTLIB += drm enchant epoxy estdc++ expat ffi fontconfig freetype
+WANTLIB += drm enchant epoxy $(LIBCXX) expat ffi fontconfig freetype
 WANTLIB += gbm gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gpg-error graphite2 gstapp-1.0
 WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0