oudev,2,3,4,5,6 are a dumping ground for a lot of things
chipping at it one class at the time...
organize the #include of the impacted source while at it.

Change-Id: I57bbb1f9e3c6b2ac6b3ca127e5976bf16f3e3cf8