remove unnecessary code and includes from *_patcher.c