Is there any reason why the code should continue to have #ifdef WITH_PRESENCE in it?
According to git blame, this has been hard defined in octypes.h since the file was created in commit 10c13b88b24238edc5d30c5b84d4b4e9965204aa on April 30 2015 - two years ago. It's probably been hard defined longer than that, as the diff of that commit shows it was part of what moved from ocstack.h, where it was defined at that time. so from that viewpoint there seems little reason to have "conditional" bracketing of code using this preprocessor symbol.
