[PATCH] rio: more header cleanup