SQUASH ME: added missing includes