RECORDER: Streamline recorder includes
RECORDER: Fix guard defines