r12693: Move core data structures out of smb.h into core.h