Remove .WP #defines