Fix header issues after merging recent revisions
Fix header issues after merging recent revisions

shengfuintel/OpenSubdiv,lookup1980/OpenSubdiv,shengfuintel/OpenSubdiv,jcowles/OpenSubdiv,xldeveloper/OpenSubdiv,poljere/OpenSubdiv,takahito-tejima/OpenSubdiv-exp,xldeveloper/OpenSubdiv,lookup1980/OpenSubdiv,jcowles/OpenSubdiv,lookup1980/OpenSubdiv,poljere/OpenSubdiv,nyotis/OpenSubdiv,c64kernal/OpenSubdiv,nyotis/OpenSubdiv,takahito-tejima/OpenSubdiv-exp,c64kernal/OpenSubdiv,takahito-tejima/OpenSubdiv-exp,takahito-tejima/OpenSubdiv,anshuarya/OpenSubdiv,nyotis/OpenSubdiv,shengfuintel/OpenSubdiv,c64kernal/OpenSubdiv,takahito-tejima/OpenSubdiv-exp,anshuarya/OpenSubdiv,xldeveloper/OpenSubdiv,takahito-tejima/OpenSubdiv,jcowles/OpenSubdiv,takahito-tejima/OpenSubdiv,poljere/OpenSubdiv,anshuarya/OpenSubdiv