Modernize Include, add token, fix paths for MakeDriver