removed preprocessor ifs in header files