Fixed errors with multiple includes