.. so I don't keep tripping over the bad ones during my UNO cleanup work.

(1) make them all use a similar syntax, makes it easier to run my automatic checker
(2) some of them were just cut'n'paste accidents waiting to happen
(3) remove unnecessary header guards in the __including__ file. That is very brittle.

Change-Id: I4e679c15161483ad93aeb316a25d6db6d97e9d4e