Add headers to CMake build so that they are accessible from Xcode.
Fix header issues.
Fix typo in src/dest IPs and add client IP for additional filtering.