Just sprinkle the necessary structs around...
Signed-off-by: NDavid Kilroy <kilroyd@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>