*) move small declarations in appropriate places and delete the surplus header files *) delete insignificant comments