Remove deleted headers

Fix Issue #1137