More extraneous includes