add missing includes, put back include comments