cleanup include files
Merge pull request #460 from wolfmanjm/upstreamedge

cleanup include files