Clean up last commit - remove the __STDC_VERSION__ check in tap.h