Small manual cleanups after runing cppclean

After runing of cppclean . on code base some unused forward decl was found.

In order to find some code issues, in future I'll try to run on this code base: include-what-you-use, clang-static-analyzer and clang-tidy.