Update compat and control to version 8.

Original patch from Hideki Yamane

Signed-off-by: Chris Lalancette <clalancette@gmail.com>