Reduce sw_fill to single compilation unit