diff --git a/game/history.cpp b/game/history.cpp
index 8241835..909f2ef 100644
--- a/game/history.cpp
+++ b/game/history.cpp
@@ -39,7 +39,7 @@
 
 History::History()
 {
-    Turn* t = new Turn ();
+    Turn* t = new Turn();
     m_history.clear();
     m_history.push_back(t);
 }
@@ -143,7 +143,7 @@ void History::removeLastTurn()
         delete t;
     }
 
-    // now we have the previous played round in back()
+    // Now we have the previous played round in back()
     Turn* t = m_history.back();
     t->setNum(0);
     t->setPlayer(0);
@@ -154,19 +154,19 @@ void History::removeLastTurn()
 }
 
 
-std::string History::toString() const
+string History::toString() const
 {
     unsigned int i;
-    std::string rs = "";
+    string rs = "";
 #ifdef DEBUG
     char buff[20];
-    sprintf(buff,"%d",m_history.size());
-    rs = "history size = " + std::string(buff) + "\n\n";
+    sprintf(buff, "%ld", m_history.size());
+    rs = "history size = " + string(buff) + "\n\n";
 #endif
     for (i = 0; i < m_history.size(); i++)
     {
         Turn *t = m_history[i];
-        rs += t->toString() + std::string("\n");
+        rs += t->toString() + "\n";
     }
     return rs;
 }
diff --git a/game/history.h b/game/history.h
index 22c4472..3ef0b11 100644
--- a/game/history.h
+++ b/game/history.h
@@ -27,10 +27,16 @@
 #ifndef _HISTORY_H
 #define _HISTORY_H
 
+#include <string>
 #include <vector>
-#include "pldrack.h"
-#include "round.h"
-#include "turn.h"
+
+using std::string;
+using std::vector;
+
+class Round;
+class Turn;
+class PlayedRack;
+
 
 /**
  * History stores all the turns that have been played
@@ -39,23 +45,23 @@
  *  - one for each of the players
  *
  * A History is never void (getSize() can be used as the is the current turn
- * number for the complete game history). 
+ * number for the complete game history).
  *
  * History starts at zero.
  *
  * The top of the history is an empty
  * Turn until it has been filled and game is up to a new round.
- * 
- * getCurrentRack() can/should be used to store the current played rack. 
+ *
+ * getCurrentRack() can/should be used to store the current played rack.
  * setCurrentRack must be called whenever the current played rack is
  * modified.
- * 
+ *
  * History owns the turns that it stores. Do not delete a turn referenced by History
  */
 
 class History
 {
- public:
+public:
     History();
     virtual ~History();
 
@@ -82,10 +88,10 @@ class History
     void removeLastTurn();
 
     /// String handling
-    std::string toString() const;
+    string toString() const;
 
- private:
-    std::vector < Turn* > m_history;
+private:
+    vector<Turn*> m_history;
 };
 
 #endif
diff --git a/utils/ncurses.cpp b/utils/ncurses.cpp
index 22f54e1..0905c88 100644
--- a/utils/ncurses.cpp
+++ b/utils/ncurses.cpp
@@ -36,6 +36,8 @@
 #include "duplicate.h"
 #include "freegame.h"
 #include "player.h"
+#include "history.h"
+#include "turn.h"
 
 using namespace std;
 
@@ -272,7 +274,7 @@ void CursesIntf::drawHistory(WINDOW *win, int y, int x)
                          i < m_boxStart + m_boxLines; i++)
     {
         const Turn& t = m_game->getHistory().getTurn(i);
-	const Round& r = t.getRound();
+        const Round& r = t.getRound();
         string word = r.getWord();
         string coord = r.getCoord().toString();
         boxPrint(win, i + 2, x + 2,
@@ -280,7 +282,7 @@ void CursesIntf::drawHistory(WINDOW *win, int y, int x)
                  i + 1, t.getPlayedRack().toString().c_str(), word.c_str(),
                  string(15 - word.size(), ' ').c_str(),
                  coord.c_str(), r.getPoints(),
-		 t.getPlayer(), r.getBonus() ? '*' : ' ');
+                 t.getPlayer(), r.getBonus() ? '*' : ' ');
     }
     mvwvline(win, y + 1, x + 5,  ACS_VLINE, min(i + 2 - m_boxStart, m_boxLines));
     mvwvline(win, y + 1, x + 16, ACS_VLINE, min(i + 2 - m_boxStart, m_boxLines));