Since kvm.h can be used in files compiled once,
we can partially revert
b33612d0.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>