Rearranged includes to prevent uv headers from being included in other
sol projects.