clean up unwanted includes
more panel clean up of unused includes and defines
Merge pull request #277 from wolfmanjm/upstreamedge

Upstreamedge