Rewrite client struct
Protect header from double includes