[DF-2294] fix header define
[DF-2293] update round logic