Update makefile.in dependencies. Add header wrappers.