correct some header reference
fix user.h confict