fixing inclusion issues