Improve some include guards to match file names
--krazy
(cherry picked from commit f482b2798c0106be81725b089dc9b9098ae44af3)