NAWQAAN-381: remove extraneous includes