Proper includes from transitions