[PATCH] uml: inclusion cleanup