diff --git a/aql2/src/prompt/HistoryRegister.h b/aql2/src/prompt/HistoryRegister.h
index c6ab8e8c6bb3721816237470ab419c1fe954aeff..24912892a82272e1c996796f4ea5663859bd6b91 100644
--- a/aql2/src/prompt/HistoryRegister.h
+++ b/aql2/src/prompt/HistoryRegister.h
@@ -8,9 +8,7 @@
 #ifndef _HISTORY_REGISTER_H_
 #define _HISTORY_REGISTER_H_
 
-#include <alib/string>
-
-#include <readline/history.h>
+#include "ReadlinePromptHistory.h"
 
 #include <lexer/Lexer.h>
 
@@ -26,7 +24,7 @@ public:
 		if ( m_allowHistory ) {
 			std::string line = m_lexer.getLine ( );
 			ext::trim ( line );
-			add_history ( line.c_str ( ) );
+			ReadlinePromptHistory::addHistory ( line );
 		}
 	}
 };
diff --git a/aql2/src/prompt/ReadlinePromptHistory.h b/aql2/src/prompt/ReadlinePromptHistory.h
index 691fd99a0fb08c89f1835451d0ade898a5b11e9e..87d076bb9344ba4586a43f1529213240420776ad 100644
--- a/aql2/src/prompt/ReadlinePromptHistory.h
+++ b/aql2/src/prompt/ReadlinePromptHistory.h
@@ -86,6 +86,10 @@ public:
 		write_history ( history_file.c_str ( ) );
 	}
 
+	static void addHistory ( const std::string & line ) {
+		add_history ( line.c_str ( ) );
+	}
+
 };
 
 #endif /* _READLINE_PROMPT_HISTORY_H */