Remove now unncessary casts and use the same order for include files.
Signed-off-by: Tony Lindgren <tony@atomide.com>