includes are auto-generated by CommonCode.cmake, and the other stuff has moved.