am 29fea7b1: Merge "Added missing header to window.h"

* commit '29fea7b17a35390e9a463079936bb8c20bcb1a15':
  Added missing header to window.h