Currently these deleted function declarations are still in the private section of the class declarations but will be moved by hand to the public section over time as this is too complex to automate reliably.
Also removed __GNUC__ conditional compilation statements which are no longer needed.