Fix build after aout reorganization