header file cleanup, put kernels for IntelHD in right order