Attached is a small cleanup patch for the sn2 header files which removes
some cases of excessive header file inclusion.