Update submodules
Fix left-over XP preprocessor defines