Trying patch from @archaelus.
Patch works great! I also fixed most “Include file not found” errors
Merge branch 'docb_gen-patch'