fix few headers that were using old imports