Includes needed by Root v5-15-02