diff --git a/configure b/configure
index 3d6cb624c0..1bdac87b51 100755
--- a/configure
+++ b/configure
@@ -4,6 +4,8 @@ PACKAGE_NAME=retroarch
 
 cat /dev/null > config.log
 
+. qb/qb.system.sh
+
 . qb/qb.params.sh
 
 . qb/qb.comp.sh
diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
index d3cf2bd184..f87d246b53 100644
--- a/qb/qb.comp.sh
+++ b/qb/qb.comp.sh
@@ -4,33 +4,6 @@ TEMP_C=.tmp.c
 TEMP_CXX=.tmp.cxx
 TEMP_EXE=.tmp
 
-if [ -n "$CROSS_COMPILE" ]; then
-	case "$CROSS_COMPILE" in
-		*'-mingw32'*) OS='Win32';;
-		*);;
-	esac
-fi
-
-if [ -z "$CROSS_COMPILE" ] || [ -z "$OS" ]; then
-	case "$(uname)" in
-		'Linux') OS='Linux';;
-		*'BSD') OS='BSD';;
-		'Darwin') OS='Darwin';;
-		'CYGWIN'*) OS='Cygwin';;
-		'Haiku') OS='Haiku';;
-		'MINGW'*) OS='Win32';;
-		*) OS="Win32";;
-	esac
-fi
-
-DISTRO=''
-if [ -e /etc/lsb-release ]; then
-	. /etc/lsb-release
-	DISTRO="(${DISTRIB_DESCRIPTION} ${DISTRIB_RELEASE})"
-fi
-
-echo "Checking operating system ... $OS ${DISTRO}"
-
 # Checking for working C compiler
 cat << EOF > "$TEMP_C"
 #include <stdio.h>
diff --git a/qb/qb.system.sh b/qb/qb.system.sh
new file mode 100644
index 0000000000..63d465e44d
--- /dev/null
+++ b/qb/qb.system.sh
@@ -0,0 +1,28 @@
+
+if [ -n "$CROSS_COMPILE" ]; then
+	case "$CROSS_COMPILE" in
+		*'-mingw32'*) OS='Win32';;
+		*);;
+	esac
+fi
+
+if [ -z "$CROSS_COMPILE" ] || [ -z "$OS" ]; then
+	case "$(uname)" in
+		'Linux') OS='Linux';;
+		*'BSD') OS='BSD';;
+		'Darwin') OS='Darwin';;
+		'CYGWIN'*) OS='Cygwin';;
+		'Haiku') OS='Haiku';;
+		'MINGW'*) OS='Win32';;
+		*) OS="Win32";;
+	esac
+fi
+
+DISTRO=''
+if [ -e /etc/lsb-release ]; then
+	. /etc/lsb-release
+	DISTRO="(${DISTRIB_DESCRIPTION} ${DISTRIB_RELEASE})"
+fi
+
+echo "Checking operating system ... $OS ${DISTRO}"
+