Fixed User Header Search Paths for Kiwi

Didn't realize before there was a significant renaming
and moving of files recently.