revert include order change, fix line endings again, trying to fix the travis build