updated single-include version