Global pointers clean-up (& headers)