diff --git a/Makefile b/Makefile
index a564c2bf1b..9a46ab2297 100644
--- a/Makefile
+++ b/Makefile
@@ -292,8 +292,10 @@ endif
 
 CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. -pedantic
 ifeq ($(CXX_BUILD), 1)
+   LD = $(CXX)
    CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
 else
+   LD = $(CC)
    ifneq ($(findstring icc,$(CC)),)
       CFLAGS += -std=c99 -D_GNU_SOURCE
    else
@@ -312,7 +314,7 @@ config.mk: configure qb/*
 	@exit 1
 
 retroarch: $(OBJ)
-	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(Q)$(LD) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
 	@$(if $(Q), $(shell echo echo LD $@),)
 
 tools/retroarch-joyconfig: $(JOYCONFIG_OBJ)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index dcb38df541..3af5593452 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -160,6 +160,8 @@ fi
 check_pkgconf XML libxml-2.0
 check_pkgconf FREETYPE freetype2
 check_pkgconf X11 x11
+[ "$HAVE_X11" = "no" ] && HAVE_XEXT=no
+
 check_pkgconf XEXT xext
 if [ "$HAVE_X11" = 'yes' ] && [ "$HAVE_XEXT" = 'yes' ]; then
    check_pkgconf XVIDEO xv
diff --git a/qb/config.params.sh b/qb/config.params.sh
index a829f3a2fb..e41943b08d 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -8,6 +8,7 @@ HAVE_NETPLAY=auto       # Enable netplay support
 HAVE_CONFIGFILE=yes     # Disable support for config file
 HAVE_OPENGL=yes         # Disable OpenGL support
 HAVE_GLES=no            # Use GLESv2 instead of desktop GL
+HAVE_X11=auto           # Disable everything X11.
 HAVE_KMS=auto           # Enable KMS context support
 HAVE_EGL=auto           # Enable EGL context support
 HAVE_VG=auto            # Enable OpenVG support