Deprecate some recursive includes from the store.h API header, and put back