Adjust makefiles and code to make use of S130