Port acinclude changes from v3.0.x