Remove .cpp #includes

It is cleaner to not do that and just include the proper file in the
build files if needed.