Reduced severe redunduncy in some header files