+ #ifndef to types (re)definitions