Tiny includes clearup