core/CMakeLists: Add subdir header files
Merge pull request #261 from lclc/swifg

core/CMakeLists: Add subdir header files
Removed dead code.
Merge pull request #263 from murrekatt/cleanup

Removed dead code.
cppcheck: update includes