Remove unnecesary  header files; fix typo in window name