diff --git a/qb/config.params.sh b/qb/config.params.sh
index 6ab90745ed..0346fe255e 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -5,6 +5,7 @@ HAVE_XMB=auto           # Enable XMB menu
 HAVE_DYNAMIC=yes        # Disable dynamic loading of libretro library
 HAVE_SDL=auto           # SDL support
 HAVE_SDL2=auto          # SDL2 support (disables SDL 1.x)
+C89_SDL2=no
 HAVE_LIBUSB=auto        # Libusb HID support
 HAVE_UDEV=auto          # Udev/Evdev gamepad support
 HAVE_LIBRETRO=          # libretro library used
@@ -43,10 +44,12 @@ HAVE_AL=auto            # Enable OpenAL support
 HAVE_JACK=auto          # Enable JACK support
 HAVE_COREAUDIO=auto     # Enable CoreAudio support
 HAVE_PULSE=auto         # Enable PulseAudio support
+C89_PULSE=no
 HAVE_FREETYPE=auto      # Enable FreeType support
 HAVE_STB_FONT=yes       # Disable stb_truetype font support
 HAVE_XVIDEO=auto        # Enable XVideo support
 HAVE_PYTHON=auto        # Enable Python 3 support for shaders
+C89_PYTHON=no
 HAVE_V4L2=auto          # Enable video4linux2 support
 HAVE_NEON=no            # Forcefully enable ARM NEON optimizations
 HAVE_SSE=no             # Forcefully enable x86 SSE optimizations (SSE, SSE2)
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index e56d9b7eea..7dcf1a3d15 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -212,7 +212,11 @@ create_config_header()
 
 		while [ "$1" ]; do
 			case $(eval echo \$HAVE_$1) in
-				'yes') echo "#define HAVE_$1 1";;
+				'yes')
+					if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "#if __cplusplus || __STDC_VERSION__ >= 199901L"; fi
+					echo "#define HAVE_$1 1"
+					if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "#endif"; fi
+					;;
 				'no') echo "/* #undef HAVE_$1 */";;
 			esac
 			shift
@@ -247,7 +251,11 @@ create_config_make()
 
 		while [ "$1" ]; do
 			case $(eval echo \$HAVE_$1) in
-				'yes') echo "HAVE_$1 = 1";;
+				'yes')
+					if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "ifneq (\$(C89_BUILD),1)"; fi
+					echo "HAVE_$1 = 1"
+					if [ "$(eval echo \$C89_$1)" = "no" ]; then echo "endif"; fi
+					;;
 				'no') echo "HAVE_$1 = 0";;
 			esac