Finish s/include-raw// rename