Added conditional includes
Fixed include logic