Adding last of the smart includes