Revert "iclient.h: Fix include error due to missing userid.h"

This reverts commit fe2fa2204be07fc35e69a63b587e8c0395548e60.