remove unused #include,, improve code readability
2 files changed