Correction to previous commit, needed to tweak some include
directories after shuffling order of subdirectories and
compiler flags tweaks.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@54624 954f8c5b-7b00-dc11-b283-0030488c597c