Revert "removed h includes form cpp files"
This reverts commit a1873a3bca994633283147a30611c86852baf280.