More public headers stuff.