- restored original includes
- removed unnecessary macro definitions