--- engine/src/segment/TransductionLog.cpp.orig	2008-11-04 01:30:02 +0300
+++ engine/src/segment/TransductionLog.cpp	2008-11-04 01:40:47 +0300
@@ -22,6 +22,7 @@ Description:
 #endif
 
 #include <math.h>
+#include <string.h>
 
 #undef THIS_FILE
 DEFINE_THIS_FILE


--- wrappers/pangographite/pangographite.cpp.orig	2008-11-04 01:29:54 +0300
+++ wrappers/pangographite/pangographite.cpp	2008-11-04 01:51:38 +0300
@@ -22,7 +22,9 @@
 
 #include "graphitecache.h"
 #include "pangographite.h"
+
 #include <math.h>
+#include <string.h>
 
 typedef std::pair<gr::GlyphIterator, gr::GlyphIterator> GlyphRange;
 typedef std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> GrGlyphSet;
@@ -349,7 +351,7 @@ void graphite_PangoGlyphString(const cha
             if (rtl)
             {
                 if (currGlyph > 0)
-                    std::memmove(sorted + 1, sorted, sizeof(int) * currGlyph);
+                    memmove(sorted + 1, sorted, sizeof(int) * currGlyph);
                 sorted[0] = currGlyph;
             }
             else
@@ -377,7 +379,7 @@ void graphite_PangoGlyphString(const cha
             }
             if (i < currGlyph)
             {
-                std::memmove(sorted + i + 1, sorted + i, sizeof(int) * (currGlyph - i));
+                memmove(sorted + i + 1, sorted + i, sizeof(int) * (currGlyph - i));
             }
             sorted[i] = currGlyph;
         }