diff --git a/library/Console-linux.cpp b/library/Console-linux.cpp
index acbf5b119..4679f683e 100644
--- a/library/Console-linux.cpp
+++ b/library/Console-linux.cpp
@@ -1,6 +1,5 @@
 /*
 https://github.com/peterix/dfhack
-Copyright (c) 2011 Petr Mrázek <peterix@gmail.com>
 
 A thread-safe logging console with a line editor.
 
@@ -19,6 +18,7 @@ the 2010 UNIX computers around.
 
 Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
 Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+Copyright (c) 2011, Petr Mrázek <peterix@gmail.com>
 
 All rights reserved.
 
@@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "dfhack/Console.h"
-#include "dfhack/extra/stdiostream.h"
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 #include <sstream>
 #include <stdio.h>
 #include <string.h>
diff --git a/library/Console-windows.cpp b/library/Console-windows.cpp
index e0e5310f3..ffbd2a83a 100644
--- a/library/Console-windows.cpp
+++ b/library/Console-windows.cpp
@@ -40,8 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <conio.h>
 #include <stdarg.h>
 
-#include "dfhack/extra/stdiostream.h"
-#include < process.h>
+#include <process.h>
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -453,6 +452,7 @@ bool Console::init(void)
     GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),&oldMode);
     newMode = oldMode | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
     SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),newMode);
+    SetConsoleCtrlHandler(NULL,true);
     std::ios::sync_with_stdio();
 
     // make our own weird streams so our IO isn't redirected