r9555: More updates. Everything except for secrets.c compiles now..