remove unused headers from include (ref #784)
remove unused files (fix #784)
remove unused include