Merge pull request #276 from wolfmanjm/upstreamedge

clean up panel headers
clean up unwanted includes
more panel clean up of unused includes and defines