... and also fix the multiple inclusion guard so it actually _works_
Signed-off-by: David Woodhouse <dwmw2@infradead.org>