code style stuff

canonicalize include file ordering

add Peter's coding style