Heartbeat - compiles with errors from includes

* patches added