.h files cleanup