COMP: Remove #if 0 clauses

I also removed 3 header files whose entire contents
were inside #if 0, and weren't being included anywhere