s3-build: use dbwrap.h only where needed.