Update HP aCC config and move header include outside namespace declarations (with thanks to Boris Gubenko for providing and testing these).