From: Andrew Vasquez <praka@users.sourceforge.net>

Instead make all files do the proper includes.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>