Cherry-picked changes from master, 0fb8715..7e7fb39
Removed no-longer-needed include blocks