Public headers fix.