Fixed legacy includes