consistency fixes in header files finished