cleanup default windowing stuff header files and references