diff -aur gift-0.1.9+3epsilon/GIFTServer/modifyDistanceMatrix.cc gift-0.1.9+3epsilon.foo/GIFTServer/modifyDistanceMatrix.cc
--- gift-0.1.9+3epsilon/GIFTServer/modifyDistanceMatrix.cc	2002-07-22 09:09:30.000000000 +0200
+++ gift-0.1.9+3epsilon.foo/GIFTServer/modifyDistanceMatrix.cc	2004-04-06 19:20:32.460489856 +0200
@@ -14,6 +14,7 @@
 #include <string>
 #include <map>
 #include <functional>
+#include <assert.h>
 
 using namespace std;
 
diff -aur gift-0.1.9+3epsilon/libGIFTAcInvertedFile/cc/CAcIFMySQL.cc gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/cc/CAcIFMySQL.cc
--- gift-0.1.9+3epsilon/libGIFTAcInvertedFile/cc/CAcIFMySQL.cc	2002-07-22 09:09:28.000000000 +0200
+++ gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/cc/CAcIFMySQL.cc	2004-04-06 19:17:08.477499984 +0200
@@ -196,65 +196,22 @@
   list<string> tableList;
     
     // define description table
-  tableList.push_back ( "CREATE TABLE databaseDescription (
-name         varchar(30) NOT NULL,
-description  varchar(255),
-nbrIndexedImages int UNSIGNED DEFAULT '0' NOT NULL,
-nbrImagesInDB    int UNSIGNED DEFAULT '0' NOT NULL, 
-nbrFeatures  int UNSIGNED DEFAULT '0' NOT NULL,
-PRIMARY KEY (name),
-INDEX nameIndex (name) )" );
+  tableList.push_back ( "CREATE TABLE databaseDescription (name         varchar(30) NOT NULL, description  varchar(255), nbrIndexedImages int UNSIGNED DEFAULT '0' NOT NULL,nbrImagesInDB    int UNSIGNED DEFAULT '0' NOT NULL, nbrFeatures  int UNSIGNED DEFAULT '0' NOT NULL, PRIMARY KEY (name), INDEX nameIndex (name) )" );
 
   // define documentTable
-  tableList.push_back ( "CREATE TABLE documentTable (
-documentID      int UNSIGNED NOT NULL,
-nbrFeatures     int UNSIGNED,
-url             varchar(100) NOT NULL,
-urlThumbnail    varchar(100),
-urlFeatureFile  varchar(100),
-FeaturesAndDocFreq  blob,
-XMLdocumentDesc    blob,
-keywords        varchar(255),
-PRIMARY KEY    (documentID),
-INDEX documentIDindex (documentID),
-INDEX urlIndex (url) )" );
+  tableList.push_back ( "CREATE TABLE documentTable ( documentID      int UNSIGNED NOT NULL, nbrFeatures     int UNSIGNED, url             varchar(100) NOT NULL, urlThumbnail    varchar(100), urlFeatureFile  varchar(100), FeaturesAndDocFreq  blob, XMLdocumentDesc    blob, keywords        varchar(255), PRIMARY KEY    (documentID), INDEX documentIDindex (documentID), INDEX urlIndex (url) )" );
   
   // define featureTable
-  tableList.push_back ( "CREATE TABLE featureTable (
-featureID        int UNSIGNED NOT NULL,
-featureDescr     varchar(100),
-collectionFreq   real,
-minimumDocFreq   real,
-maximumDocFreq   real,
-documentID_DocFreq  blob,
-nbrDocumentsWithFeature  int,
-XMLfeatureDesc   blob,
-PRIMARY KEY     (featureID),
-INDEX featureIDindex (featureID) )" );
+  tableList.push_back ( "CREATE TABLE featureTable ( featureID        int UNSIGNED NOT NULL, featureDescr     varchar(100), collectionFreq   real, minimumDocFreq   real, maximumDocFreq   real, documentID_DocFreq  blob, nbrDocumentsWithFeature  int, XMLfeatureDesc   blob, PRIMARY KEY     (featureID), INDEX featureIDindex (featureID) )" );
 
   // define documentFeatureConnection table
-  tableList.push_back ( "CREATE TABLE documentFeatureConnection (
-documentID   int UNSIGNED NOT NULL,
-featureID    int UNSIGNED NOT NULL,
-docFreq      real NOT NULL,
-PRIMARY KEY (documentID, featureID),
-INDEX documentIDindex (documentID),
-INDEX featureIDindex (featureID) )" );
+  tableList.push_back ( "CREATE TABLE documentFeatureConnection ( documentID   int UNSIGNED NOT NULL, featureID    int UNSIGNED NOT NULL, docFreq      real NOT NULL, PRIMARY KEY (documentID, featureID), INDEX documentIDindex (documentID), INDEX featureIDindex (featureID) )" );
 
   // define annotationTable_1
-  tableList.push_back ( "CREATE TABLE annotationTable_1 (
-documentID   int UNSIGNED NOT NULL,
-text         varchar(127) NOT NULL,
-docFreq      real,
-PRIMARY KEY (documentID),
-INDEX documentIDindex (documentID) )" );
+  tableList.push_back ( "CREATE TABLE annotationTable_1 ( documentID   int UNSIGNED NOT NULL, text         varchar(127) NOT NULL, docFreq      real, PRIMARY KEY (documentID), INDEX documentIDindex (documentID) )" );
 
   // define annotationTable_2
-  tableList.push_back ( "CREATE TABLE annotationTable_2 (
-featureID    int UNSIGNED NOT NULL,
-text         varchar(127) NOT NULL,
-PRIMARY KEY (featureID),
-INDEX featureIDindex (featureID) )" );
+  tableList.push_back ( "CREATE TABLE annotationTable_2 ( featureID    int UNSIGNED NOT NULL, text         varchar(127) NOT NULL, PRIMARY KEY (featureID), INDEX featureIDindex (featureID) )" );
    
 
   // execute creation of the tableList and load corresponding inFile if existing
diff -aur gift-0.1.9+3epsilon/libGIFTAcInvertedFile/cc/CInvertedFileChunk.cc gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/cc/CInvertedFileChunk.cc
--- gift-0.1.9+3epsilon/libGIFTAcInvertedFile/cc/CInvertedFileChunk.cc	2002-07-22 09:09:28.000000000 +0200
+++ gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/cc/CInvertedFileChunk.cc	2004-04-06 19:17:51.263995448 +0200
@@ -40,7 +40,7 @@
 #include "FeatureExtraction/gift_features.h"
 #include "libGIFTAcInvertedFile/include/CInvertedFileChunk.h"
 #include <algorithm>
-
+#include <assert.h>
 
 /***************************************
 *
diff -aur gift-0.1.9+3epsilon/libGIFTAcInvertedFile/include/merge_sort_streams.h gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/include/merge_sort_streams.h
--- gift-0.1.9+3epsilon/libGIFTAcInvertedFile/include/merge_sort_streams.h	2002-11-05 18:21:57.000000000 +0100
+++ gift-0.1.9+3epsilon.foo/libGIFTAcInvertedFile/include/merge_sort_streams.h	2004-04-06 19:14:21.520881248 +0200
@@ -30,6 +30,7 @@
 #include <memory> // auto_ptr
 #include <algorithm> // using swap
 #include <fstream>   // file access
+#include <assert.h>
 
 using namespace std;