diff --git a/buddy/ChangeLog b/buddy/ChangeLog
index cd48a3a95..5c9c0b64f 100644
--- a/buddy/ChangeLog
+++ b/buddy/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-10  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Fix some warnings reported by gcc.
+
+	* buddy/src/kernel.c (errorstrings): Mark these as const.
+	* buddy/src/reorder.c (reorder_gbc): Fix prototype.
+	(siftTestCmp): Add missing const in cast.
+	(bdd_reorder_auto): Actually call bdd_reorder_ready().
+
 2011-04-10  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Add support for --enable-devel and similar macros.
diff --git a/buddy/src/kernel.c b/buddy/src/kernel.c
index 36492d0af..14ca6fb00 100644
--- a/buddy/src/kernel.c
+++ b/buddy/src/kernel.c
@@ -117,7 +117,7 @@ static bdd2inthandler resize_handler;  /* Node-table-resize handler */
 
 
    /* Strings for all error mesages */
-static char *errorstrings[BDD_ERRNUM] =
+static const char *errorstrings[BDD_ERRNUM] =
 { "Out of memory", "Unknown variable", "Value out of range",
   "Unknown BDD root dereferenced", "bdd_init() called twice",
   "File operation failed", "Incorrect file format",
diff --git a/buddy/src/reorder.c b/buddy/src/reorder.c
index 1f593c160..1adb86cec 100644
--- a/buddy/src/reorder.c
+++ b/buddy/src/reorder.c
@@ -115,7 +115,7 @@ static int resizedInMakenode;
    /* Reordering prototypes */
 static void blockdown(BddTree *);
 static void addref_rec(int, char *);
-static void reorder_gbc();
+static void reorder_gbc(void);
 static void reorder_setLevellookup(void);
 static int  reorder_makenode(int, int, int);
 static int  reorder_varup(int);
@@ -614,8 +614,8 @@ static BddTree *reorder_sift_seq(BddTree *t, BddTree **seq, int num)
  */
 static int siftTestCmp(const void *aa, const void *bb)
 {
-   const sizePair *a = (sizePair*)aa;
-   const sizePair *b = (sizePair*)bb;
+   const sizePair *a = (const sizePair*)aa;
+   const sizePair *b = (const sizePair*)bb;
 
    if (a->val < b->val)
       return -1;
@@ -1626,7 +1626,7 @@ int bdd_reorder_ready(void)
 
 void bdd_reorder_auto(void)
 {
-   if (!bdd_reorder_ready)
+   if (!bdd_reorder_ready())
       return;
 
    if (reorder_handler != NULL)