A few inclusions were being satisfied indirectly. To prevent breakages in the future, include these directly.
