Tidy up patches
Use CPPFLAGS too
Add doc-base
Add watch file