Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes: > +++ b/util/crypto.c > @@ -0,0 +1,138 @@ > +#include "notmuch.h" It feels wrong to me for a file in util/ to include notmuch.h. It seems the same situation holds with search-path.h. There it seems we use notmuch_bool_t (although I'm not convinced that's the right return type). If that's the only reason maybe we should either factor out the definition or just return ints. > +/* Create a PKCS7 context (GMime 2.6) */ > +static notmuch_crypto_context_t * > +create_pkcs7_context (notmuch_crypto_t *crypto) > +{ > + notmuch_crypto_context_t *pkcs7ctx; I guess this is leftover, and causes the build failure. > + > +#include "notmuch.h" Same questions notmuch.h here. d