Header fixes for 2.6.32 merge (non-compiling)