Removed unnecessary includes/definitions.

2 files changed