[PATCH 7/8] remove unused #ifndef conditionals