--- gift-0.1.14/libMRML/include/CAccessorAdmin.h.orig	2009-06-11 15:57:03.000000000 +0900
+++ gift-0.1.14/libMRML/include/CAccessorAdmin.h	2009-06-11 15:57:45.000000000 +0900
@@ -111,11 +111,11 @@
   /** destructor */
   ~CAccessorAdmin();
   /**  */
-  string CAccessorAdmin::getAlgorithmIDListID()const;
+  string getAlgorithmIDListID()const;
   /**  */
-  string CAccessorAdmin::getName()const;
+  string getName()const;
   /**  */
-  string CAccessorAdmin::getID()const;
+  string getID()const;
 
   /** for sorting */
   friend class CSortByName_pAP;
--- gift-0.1.14/libMRML/include/CI18nTranslator.h.orig	2009-06-11 16:00:07.000000000 +0900
+++ gift-0.1.14/libMRML/include/CI18nTranslator.h	2009-06-11 16:00:38.000000000 +0900
@@ -98,11 +98,11 @@
   void translateXMLTree(string inLanguageCode,
 			CXMLElement& inoutToBeTranslated)const;
   /** for parsing the config file */
-  static void CI18nTranslator::startXMLElement(void *inUserData, 
+  static void startXMLElement(void *inUserData, 
 					       const char *inElementName, 
 					       const char **inAttributes);
   /** for parsing the config file */
-  static void CI18nTranslator::endXMLElement(void *inUserData, 
+  static void endXMLElement(void *inUserData, 
 					     const char *inElementName);
 };
 #endif
--- gift-0.1.14/libMRML/include/CAttributeList.h.orig	2009-06-11 15:55:39.000000000 +0900
+++ gift-0.1.14/libMRML/include/CAttributeList.h	2009-06-11 15:56:27.000000000 +0900
@@ -79,7 +79,7 @@
   virtual pair<bool,string> stringReadAttribute(const string& inAttribute)const;
   /** Outputting a string to XML 
    */
-  void CAttributeList::toXML(string& outString)const;
+  void toXML(string& outString)const;
   /** the destructor 
       in the case of char* as content it deletes the arrays of char.
    */
--- gift-0.1.14/libMRML/include/CSessionManager.h.orig	2009-06-11 15:59:17.000000000 +0900
+++ gift-0.1.14/libMRML/include/CSessionManager.h	2009-06-11 16:01:43.000000000 +0900
@@ -172,18 +172,18 @@
   bool rename(const string& inName);
   /** the list of preferred languages of this 
       is cleared */
-  void CSession::clearLanguages();
+  void clearLanguages();
   /** one language code is added at the back of the list
       of preferred languages */
-  void CSession::addLanguage(string inLanguageCode);
+  void addLanguage(string inLanguageCode);
   /** commit the list of languages. That means, here the
       actual language that will be used throughout the 
       translation is determined */
-  void CSession::commitLanguages(const CI18nTranslator& inTranslator);
+  void commitLanguages(const CI18nTranslator& inTranslator);
   /** get the preferred languages of this session */
-  list<string> CSession::getLanguages()const;
+  list<string> getLanguages()const;
   /** get the preferred languages of this session */
-  string CSession::getPreferredLanguage()const;
+  string getPreferredLanguage()const;
 
   //--------------------------------------------------
   /**  generating XML output for configuration/shandshake */
@@ -420,7 +420,7 @@
   /** i18n: get the list of preferred languages of this session */
   list<string> getSessionLanguages(const string& inSessionID)const;
   /** i18n: get the list of preferred languages of this session */
-  void CSessionManager::translate(string inSessionID,
+  void translate(string inSessionID,
 				  CXMLElement& inoutToBeTranslated)const;
 };
 
--- gift-0.1.14/libMRML/cc/CI18nTranslator.cc.orig	2009-06-11 16:09:49.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CI18nTranslator.cc	2009-06-11 16:10:10.000000000 +0900
@@ -25,6 +25,7 @@
 #include "libMRML/include/CXEVI18nTranslator.h"
 #include <iostream>
 #include <fstream>
+#include <cstring>
 /**
    This class offers runtime translation of strings. In contrast
    to GNU gettext we can chose during runtime the language without 
--- gift-0.1.14/libMRML/cc/CCommunicationHandler.cc.orig	2009-06-11 16:08:16.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CCommunicationHandler.cc	2009-06-11 16:11:47.000000000 +0900
@@ -1,6 +1,7 @@
 //configuration files for sessions and algorithms/collections
 
 //Sockets
+#include <cstring>
 #include <ctime>
 #include <unistd.h>
 #include <fcntl.h>
@@ -13,7 +14,7 @@
 #include "libMRML/include/CCommunicationHandler.h"
 #include <string>
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 #include "libMRML/include/mrml_const.h" //mrml string constants newStart/EndMRMLElement
 #include "../include/CTimeStampGenerator.h" // for time stamps
 string gGIFTHome;//dirty but necessary
--- gift-0.1.14/libMRML/cc/CAccessorImplementation.cc.orig	2009-06-11 15:48:32.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CAccessorImplementation.cc	2009-06-11 16:11:11.000000000 +0900
@@ -54,6 +54,7 @@
 #include <iostream>
 #include <cassert>
 #include <cmath>
+#include <cstdlib>
 
 #define _NO_PRINT_OFFSET_CHECK
 #define _NO_CHECK_OFFSET_FILE
--- gift-0.1.14/libMRML/cc/CAccessorFactoryContainer.cc.orig	2009-06-11 15:51:55.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CAccessorFactoryContainer.cc	2009-06-11 16:11:23.000000000 +0900
@@ -39,7 +39,7 @@
 #include "libGIFTAcHierarchy/include/CAFHierarchy.h"
 #include "libMRML/include/CXMLElement.h"
 #include "libMRML/include/CAFPlugin.h"
-#include <string>
+#include <cstring>
 #include <iostream>
 #include <set>
 
--- gift-0.1.14/libMRML/cc/CXMLElementBuilder.cc.orig	2009-06-11 16:05:36.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CXMLElementBuilder.cc	2009-06-11 16:07:47.000000000 +0900
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <memory>
 #include <iostream> // for printouts
 #include "libMRML/include/CXMLElementBuilder.h"
--- gift-0.1.14/libMRML/cc/CQueryTreeBuilder.cc.orig	2009-06-11 16:02:34.000000000 +0900
+++ gift-0.1.14/libMRML/cc/CQueryTreeBuilder.cc	2009-06-11 16:11:34.000000000 +0900
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "libMRML/include/my_throw.h"
 #include "libMRML/include/GIFTExceptions.h"
 #include "libMRML/include/CQueryTreeBuilder.h"
--- gift-0.1.14/libGIFTAcPerl/include/CAcPerl.h.orig	2009-06-11 15:54:52.000000000 +0900
+++ gift-0.1.14/libGIFTAcPerl/include/CAcPerl.h	2009-06-11 16:51:52.000000000 +0900
@@ -114,15 +114,15 @@
   /**
    *
    */
-  string IDToURL(long int) const;
+  string IDToURL(int) const;
   /**
    *
    */
-  struct pair<bool,CAccessorElement> IDToAccessorElement(long int) const;
+  struct pair<bool,CAccessorElement> IDToAccessorElement(int) const;
   /**
    *
    */
-  struct pair<bool,long int> URLToID(const string &) const;
+  struct pair<bool,int> URLToID(const string &) const;
   /**
    *
    */
@@ -134,7 +134,7 @@
   /**
    *
    */
-  void getRandomIDs(list<long int > &, unsigned int) const;
+  void getRandomIDs(list< int > &, unsigned int) const;
   /**
    *
    */
--- gift-0.1.14/libGIFTAcPerl/cc/CAFPerl.cc.orig	2009-06-11 16:24:33.000000000 +0900
+++ gift-0.1.14/libGIFTAcPerl/cc/CAFPerl.cc	2009-06-11 16:31:52.000000000 +0900
@@ -14,4 +14,5 @@
   mName="perl";
 };
 
+
 #endif
--- gift-0.1.14/libGIFTAcPerl/cc/CAcPerl.cc.orig	2009-06-11 16:19:27.000000000 +0900
+++ gift-0.1.14/libGIFTAcPerl/cc/CAcPerl.cc	2009-06-11 16:51:53.000000000 +0900
@@ -57,26 +57,26 @@
 /**
  *
  */
-string CAcPerl::IDToURL(long int) const{
+string CAcPerl::IDToURL(int) const{
   assert(0);
   return "this function should never be called";
 };
 /**
  *
  */
-struct pair<bool,CAccessorElement> CAcPerl::IDToAccessorElement(long int) const{
+struct pair<bool,CAccessorElement> CAcPerl::IDToAccessorElement(int) const{
   return(make_pair(bool(0),CAccessorElement(0,"null","null","null")));
 };
 /**
  *
  */
-struct pair<bool,long int> CAcPerl::URLToID(const string &) const{
+struct pair<bool,int> CAcPerl::URLToID(const string &) const{
   return(make_pair(bool(0),0));
 };
 /**
  *
  */
-void CAcPerl::getAllIDs(list<long int > &) const{
+void CAcPerl::getAllIDs(list< int > &) const{
     assert(0);
 };
 /**
@@ -88,7 +88,7 @@
 /**
  *
  */
-void CAcPerl::getRandomIDs(list<long int > &, unsigned int) const{
+void CAcPerl::getRandomIDs(list< int > &, unsigned int) const{
   assert(0);
 };
 /**
--- gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h.orig	2009-06-11 16:12:22.000000000 +0900
+++ gift-0.1.14/libGIFTAcInvertedFile/include/CInvertedFileChunk.h	2009-06-11 16:13:24.000000000 +0900
@@ -73,7 +73,7 @@
  * add one document of to the list for one feature 
  *
  */
-  void CInvertedFileChunk::addElement(TID inDocumentID,
+  void addElement(TID inDocumentID,
 				      double inDocumentFrequency);
 
 /**
--- gift-0.1.14/libGIFTAcDistanceMatrix/include/CPersistentTranslatedIndexMatrix.h.orig	2009-06-11 16:52:36.000000000 +0900
+++ gift-0.1.14/libGIFTAcDistanceMatrix/include/CPersistentTranslatedIndexMatrix.h	2009-06-11 16:54:45.000000000 +0900
@@ -76,7 +76,7 @@
 		     CIDContentPairList& outList)const;
   ///
   bool setValue(const TTID& inX,
-		const TTID& inX,
+		const TTID& inY,
 		const TTContent& inValue)const;
   ///
   operator bool()const;
--- gift-0.1.14/GIFTServer/modifyDistanceMatrix.cc.orig	2009-06-11 16:55:24.000000000 +0900
+++ gift-0.1.14/GIFTServer/modifyDistanceMatrix.cc	2009-06-11 16:55:57.000000000 +0900
@@ -15,6 +15,7 @@
 #include <string>
 #include <map>
 #include <functional>
+#include <cstdlib>
 
 using namespace std;
 
--- gift-0.1.14/libGIFTQuInvertedFile/cc/CWeightingFunction.cc.orig	2009-06-11 16:14:03.000000000 +0900
+++ gift-0.1.14/libGIFTQuInvertedFile/cc/CWeightingFunction.cc	2009-06-11 16:16:21.000000000 +0900
@@ -17,7 +17,7 @@
 ***************************************************/
 #include <cmath>
 #include "libGIFTQuInvertedFile/include/CWeightingFunction.h"
-#include "iostream.h"
+#include <iostream>
 #include "FeatureExtraction/gift_features.h"
 
 #include <algorithm>