Revert "Reduced cql_connection headers"

This reverts commit e1538de5c5d74b417f586f7766699d7ef35846c6.