Fix of base.hpp header file

* Removed deprecated includes