- Adjusted includes for new "conn-func.h" header.