Included missing public headers