Simplify translations includes. Fix for VS2010, remove some warnings.