[RFC patches 06/13] smutil.h: add missing header file dependencies