Fix installer and include errors.