remove spurious file
fix #ifdef guards
add missing #include (fix e8d6beb9e546602a925bfb1da1fd701d40118480)