--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -34,49 +34,6 @@
 #include "BrowserWidget.h"
 #include "IRCWidget.h"
 
-// Octave includes
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_URL
-#include "octave/config.h"
-
-#include "octave/debug.h"
-#include "octave/octave.h"
-#include "octave/symtab.h"
-#include "octave/parse.h"
-#include "octave/unwind-prot.h"
-#include "octave/toplev.h"
-#include "octave/load-path.h"
-#include "octave/error.h"
-#include "octave/quit.h"
-#include "octave/variables.h"
-#include "octave/sighandlers.h"
-#include "octave/sysdep.h"
-#include "octave/str-vec.h"
-#include "octave/cmd-hist.h"
-#include "octave/cmd-edit.h"
-#include "octave/oct-env.h"
-#include "octave/symtab.h"
-#include "cmd-edit.h"
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-extern OCTINTERP_API YY_BUFFER_STATE create_buffer (FILE * f);
-extern OCTINTERP_API void switch_to_buffer (YY_BUFFER_STATE buf);
-extern OCTINTERP_API FILE *get_input_from_stdin (void);
-
-// System
-#include <termios.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <iostream>
-#include <vector>
-#include "pty.h"
-
 class OctaveMainThread;
 class OctaveCallbackThread;
 
@@ -200,11 +157,10 @@
 	  }
 
 	// Collect history list.
-	string_vector historyList =
-	  OctaveLink::instance ()->currentHistory ();
-	if (historyList.length ())
+        QStringList history = OctaveLink::instance ()->currentHistory ();
+        if (history.length ())
 	  {
-	    m_mainWindow->historyDockWidget ()->updateHistory (historyList);
+            m_mainWindow->historyDockWidget ()->updateHistory (history);
 	  }
 
 	usleep (100000);