diff --git a/dic/automaton.cpp b/dic/automaton.cpp
index b0a6161..9830ef1 100644
--- a/dic/automaton.cpp
+++ b/dic/automaton.cpp
@@ -29,6 +29,7 @@
 
 #include <set>
 #include <list>
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <cstdlib>
@@ -457,7 +458,7 @@ void AutomatonHelper::setAccept(astate s) const
         astate ns = *it;
         int idx = *(ns->id.begin());
         DMSG(printf("%s ", s_state_id_to_str(ns->id).c_str()));
-        if (ns->accept && (find(s->id.begin(), s->id.end(), idx) != s->id.end()))
+        if (ns->accept && (std::find(s->id.begin(), s->id.end(), idx) != s->id.end()))
         {
             DMSG(printf("(ok) "));
             s->accept = true;
diff --git a/dic/header.cpp b/dic/header.cpp
index 8064e93..2b83813 100644
--- a/dic/header.cpp
+++ b/dic/header.cpp
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <cstring> // for strcpy
 #include <string>
 #include <sstream>
 #include <iostream>
diff --git a/dic/regexpmain.cpp b/dic/regexpmain.cpp
index c94f24c..ccf01a2 100644
--- a/dic/regexpmain.cpp
+++ b/dic/regexpmain.cpp
@@ -29,6 +29,7 @@
 
 #include <exception>
 #include <iostream>
+#include <cstring> // For memset
 
 #if ENABLE_NLS
 #   include <libintl.h>
diff --git a/game/bag.cpp b/game/bag.cpp
index 78dcd9b..2ca79b9 100644
--- a/game/bag.cpp
+++ b/game/bag.cpp
@@ -20,6 +20,7 @@
  *****************************************************************************/
 
 #include <string>
+#include <cstdlib> // For rand()
 
 #include <dic.h>
 #include "bag.h"
diff --git a/game/game_io.cpp b/game/game_io.cpp
index 2c3a850..b5d1ade 100644
--- a/game/game_io.cpp
+++ b/game/game_io.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Eliot
- * Copyright (C) 2002-2007 Antoine Fraboulet & Olivier Teulière
+ * Copyright (C) 2002-2008 Antoine Fraboulet & Olivier Teulière
  * Authors: Antoine Fraboulet <antoine.fraboulet @@ free.fr>
  *          Olivier Teulière <ipkiss @@ gmail.com>
  *
@@ -19,12 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *****************************************************************************/
 
-/**
- *  \file   game_io.cpp
- *  \brief  Eliot game class file load/save handling
- *  \author Antoine Fraboulet & Olivier Teuliere
- *  \date   2002 - 2005
- */
+#include <cstring>
+#include <cstdlib> // For atoi
 
 #include "dic.h"
 #include "pldrack.h"
diff --git a/utils/ncurses.cpp b/utils/ncurses.cpp
index 7ad0069..16f1568 100644
--- a/utils/ncurses.cpp
+++ b/utils/ncurses.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2005 Eliot
+ * Copyright (C) 2005-2008 Eliot
  * Authors: Olivier Teuliere  <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #endif
 
 #include <ctype.h>
+#include <cstring> // For strlen
 #include <fstream>
 #include <algorithm>
 
@@ -268,7 +269,7 @@ void CursesIntf::drawBoard(WINDOW *win, int y, int x) const
 void CursesIntf::drawScoresRacks(WINDOW *win, int y, int x) const
 {
     // Compute the longest player name
-    unsigned int longest = 0;
+    size_t longest = 0;
     for (unsigned int i = 0; i < m_game->getNPlayers(); i++)
     {
         longest = std::max(longest, m_game->getPlayer(i).getName().size());