[PATCH] uml: header and code cleanup