Revert "db: cleanup includes"

This reverts commit 141b5ef429fd0d2dd6fbd2bca1fd467f9031a7a0.