Just small pieces at a time to make it easy to see what's happening. Taking definitions currently implemented in both f0/f3 headers and making combined, documented versions in the -v2 header.