diff --git a/bot/bot.rb b/bot/bot.rb
index 3c8b1a8eb899f3ed64a2f293937e8f0a616f3e2b..51bfb12fb3d16b27929f5d7cf5cfb9940961bd44 100755
--- a/bot/bot.rb
+++ b/bot/bot.rb
@@ -2,9 +2,9 @@
 
 ##############################################################################
 ##                                                                          ##
-##  bot: a script for semi-automatic editing                                ##
+##  bot: a script for semi-automatic editing C/C++ source code              ##
 ##                                                                          ##
-##  Joachim Wuttke 2008                                                     ##
+##  Joachim Wuttke 2008(unfinished)                                         ##
 ##                                                                          ##
 ##############################################################################
 
diff --git a/src/edif.cpp b/src/edif.cpp
index 5b5c7c2f6166f20db35d8b8c3eafe86d9fd6c46e..214dcd4030b51621e864d96e981b59e6563b3985 100644
--- a/src/edif.cpp
+++ b/src/edif.cpp
@@ -364,8 +364,8 @@ void NEdif::EditCoord( string which )
             old_co = fin->ZCo[cref.num];
             fout->ZCo[cref.num] = new_co;
         }
-        fout->lDoc.push_back( "coordinate "+string(which)+" renamed from "+
-                              old_co.str()+" into "+new_co.str() );
+        fout->lDoc.push_back( "ec"+string(which)+" "+new_co.str()+
+                              " # old: " + old_co.str() );
     }
 }
 
@@ -741,7 +741,7 @@ void NEdif::ReadTab( bool multiblock, bool fromscript )
     }
 
     mystd::fname_divide( inFile, 0, &(olf.name), 0 );
-    olf.lDoc.push_back( "data from table "+inFile );
+    olf.lDoc.push_back( ( multiblock ? "ftt " : "ft " ) + inFile );
 
     olf.xco = CCoord("x", "");
     olf.yco = CCoord("y", "");
diff --git a/src/frida2.cpp b/src/frida2.cpp
index 0e856136f068875e14439b74cb3b9b3ab3c0a526..46d5a315ea84d42b5a90b6e762be4348931e6065 100644
--- a/src/frida2.cpp
+++ b/src/frida2.cpp
@@ -283,6 +283,7 @@ int main()
                     "  mr    generic retain\n"
                     "Per point:\n"
                     "  mpd   delete\n"
+                    "  mpr   retain\n"
                     "  mpdb  delete unless in block\n"
                     "  mpa   average\n"
                     "  mpb   break into scans\n"
@@ -311,7 +312,9 @@ int main()
             } else if (cmd == "mr") {
                 NOperate::Select(0);
             } else if (cmd == "mpd") {
-                NManip::PtsDelete();
+                NManip::PtsSelect( "d" );
+            } else if (cmd == "mpr") {
+                NManip::PtsSelect( "r" );
             } else if (cmd == "mpdb") {
                 NManip::PtsRetainEqui();
             } else if (cmd == "mpa") {
@@ -325,7 +328,9 @@ int main()
             } else if (cmd == "mpq") {
                 NManip::PtsAvgeEq();
             } else if (cmd == "msd") {
-                NManip::ScaDelete();
+                NManip::ScaSelect( "d" );
+            } else if (cmd == "msr") {
+                NManip::ScaSelect( "r" );
             } else if (cmd == "msa") {
                 NManip::ScaAvge();
             } else if (cmd == "msg") {
@@ -434,7 +439,7 @@ int main()
                     "  rx0t load from xml v0, two directions separately\n"
                     "  rh   load from Drochner histogram\n";
 
-            } else if (cmd == "ry") {
+            } else if (cmd == "ry" ) {
                 NRSSM::ReadScan( 5, 0 );
             } else if (cmd == "ry2") {
                 NRSSM::ReadScan( 5, 1 );
diff --git a/src/manip.cpp b/src/manip.cpp
index a87a7b0ae5caf627c004e1db951be4d6db14afc2..479bb8f0d40d25f3057a03904a4e7bac105f56ac 100644
--- a/src/manip.cpp
+++ b/src/manip.cpp
@@ -37,35 +37,24 @@ namespace NManip {
 //* manipulations on data points                                            *//
 //***************************************************************************//
 
-void NManip::PtsDelete(void)
+void NManip::PtsSelect( string del_or_ret )
 {
-    cout << "Points delete options:\n"
-        "  (1) delete by number         (2) retain by number\n"
-        "  (3) delete if x in range     (4) retain if x in range\n"
-        "  (5) delete if y in range     (6) retain if y in range\n";
-    static int mOpt = -1;
-    mOpt = iask_lim("Option", mOpt, CLimits(0,6));
-    if (!mOpt) return;
-
-    bool seldel = mOpt % 2;
-    int  mCrit  = (mOpt+1) / 2;
-	
-    static CList LSel;
-    static CRange RSel;
-    switch (mCrit) {
-    case 1:
-        LSel.Ask("Which points", LSel);
-        break;
-    case 2:
-    case 3:
-        RSel.Ask("Which range", RSel);
-        break;
-    default:
-        cout << "! invalid mCrit\n";
+    string action;
+    bool sel_del;
+    if        ( del_or_ret=="d" ){
+        action = "Delete";
+        sel_del = true;
+    } else if ( del_or_ret=="r" ){
+        action = "Retain";
+        sel_del = false;
+    } else{
+        cout << "FATAL: invalid del_or_ret\n";
         return;
     }
 
-	
+    static CList LSel;
+    LSel.Ask( ( action + " which points" ).c_str(), LSel);
+
     const COld *fin; COld fout;
     const CScan *Sin; CScan Sout;
     bool crit;
@@ -74,7 +63,7 @@ void NManip::PtsDelete(void)
     NOlm::SelNew();
     while((fin=fiter())) {
         fout = *fin;
-        fout.lDoc.push_back("delete points ...");
+        fout.lDoc.push_back( "mp" + del_or_ret + " " + LSel.str() );
         fout.VS.clear();
 
         for (uint j=0; j<fin->VS.size(); j++) {
@@ -83,18 +72,7 @@ void NManip::PtsDelete(void)
             Sout.x.clear();
             Sout.y.clear();
             for (uint i=0; i<Sin->size(); i++) {
-                switch (mCrit) {
-                case 1:
-                    crit = LSel.contained(i);
-                    break;
-                case 2:
-                    crit = RSel.contained(Sin->x[i]);
-                    break;
-                case 3:
-                    crit = RSel.contained(Sin->y[i]);
-                    break;
-                }
-                if (seldel ^ crit)
+                if ( sel_del ^ LSel.contained(i) )
                     Sout.push_back(Sin->x[i], Sin->y[i]);
             }
             if (Sout.size())
@@ -125,7 +103,7 @@ void NManip::PtsAvge(void)
     NOlm::SelNew();
     while((fin=fiter())) {
         fout = *fin;
-        fout.lDoc.push_back("average points at " + groups);
+        fout.lDoc.push_back("mpa " + groups);
         fout.VS.clear();
 
         for (uint j=0; j<fin->VS.size(); j++) {
@@ -186,9 +164,8 @@ void NManip::PtsBreak(void)
         // new z, documentation:
         fout = *fin;
         fout.VS.clear();
-        fout.ZCo.push_back(CCoord(fin->xco.name + "_break", 
-                                  fin->xco.unit));
-        fout.lDoc.push_back("break scans at " + PSel.str());
+        fout.ZCo.push_back(CCoord(fin->xco.name + "_break", fin->xco.unit));
+        fout.lDoc.push_back("mpb " + PSel.str());
 		
         // execute per scan:
         for(uint j=0; j<fin->nScan(); ++j) {
@@ -255,7 +232,7 @@ void NManip::PtsSort( void )
 
         fout = *fin;
         fout.VS.clear();
-        fout.lDoc.push_back("mpo according to "+expr);
+        fout.lDoc.push_back("mpo "+expr);
 
         for (uint j=0; j<fin->nScan(); j++) {
             Sin = &(fin->VS[j]);
@@ -297,7 +274,7 @@ void NManip::PtsAvgeEq(void)
     NOlm::SelNew();
     while((fin=fiter())) {
         fout = *fin;
-        fout.lDoc.push_back("average points when x equal");
+        fout.lDoc.push_back("mpq # average points when x equal");
         fout.VS.clear();
 
         for (j=0; j<fin->VS.size(); j++) {
@@ -340,7 +317,7 @@ void NManip::PtsRetainEqui(void)
     NOlm::SelNew();
     while((fin=fiter())) {
         fout = *fin;
-        fout.lDoc.push_back("delete points unless x is equidistant...");
+        fout.lDoc.push_back("mpdb # delete points unless x is equidistant...");
         fout.VS.clear();
 
         for (uint j=0; j<fin->VS.size(); j++) {
@@ -426,8 +403,8 @@ void NManip::PtsGroupWeighted( void )
 
         fout2 = fout;
         fout2.yco.name = "stdv["+fout.yco.name+"]";
-        fout.lDoc.push_back("mpgw ng="+strg(ng));
-        fout2.lDoc.push_back("error bars of mpgw ng="+strg(ng));
+        fout.lDoc.push_back("mpgw "+strg(ng));
+        fout2.lDoc.push_back("error bars of mpgw "+strg(ng));
 
         Sout.Clear();
         Sout2.Clear();
@@ -576,9 +553,21 @@ void NManip::ScaRemoveConstantZ( COld *f )
     }
 }
 
-void NManip::ScaDelete(void)
+void NManip::ScaSelect( string del_or_ret )
 {
-    if (NOlm::FJSelAsk("Delete which scans")) return;
+    string action;
+    bool sel_ret;
+    if        ( del_or_ret=="d" ){
+        action = "Delete";
+        sel_ret = false;
+    } else if ( del_or_ret=="r" ){
+        action = "Retain";
+        sel_ret = true;
+    } else{
+        cout << "FATAL: invalid del_or_ret\n";
+        return;
+    }
+    if ( NOlm::FJSelAsk(action + " which scans") ) return;
 
     const COld *fin; COld fout;
     CList JSel;
@@ -588,11 +577,11 @@ void NManip::ScaDelete(void)
         fout = *fin;
 
         NOlm::FJSelGet(fiter.SelNo(), &JSel);
-        fout.lDoc.push_back("delete scans " + JSel.str());
+        fout.lDoc.push_back( "ms" + del_or_ret + " " + JSel.str());
         JSel.SortReverse();
-        for( int iv=0; iv<JSel.n(); ++iv )
-            fout.VS.erase( fout.VS.begin()+JSel.V[iv] );
-
+        for( int j=fin->nScan()-1; j>=0; --j )
+            if( sel_ret ^ JSel.contained( j ) )
+                fout.VS.erase( fout.VS.begin() + j );
         ScaRemoveConstantZ( &fout );
         NOlm::OloAdd(&fout);
     }
@@ -621,7 +610,7 @@ void NManip::ScaAvge(void)
             printf("scan selection must contain 0\n");
             return;
         }
-        fout.lDoc.push_back("average scans " + JSel.str());
+        fout.lDoc.push_back("msa " + JSel.str());
 
         fout.VS.clear();
         nz = fin->nZ();
@@ -686,7 +675,7 @@ void NManip::ScaSpawn(void)
             ((COlc*)fout)->VC.clear();
         }
         fout->ZCo.push_back(CCoord("no-in-spawn", ""));
-        fout->lDoc.push_back( "ms* spawned " + strg(njj) + "-fold" );
+        fout->lDoc.push_back( "ms* " + strg(njj) );
 
         for( uint jj=0; jj<njj; ++jj ){
             for( uint j=0; j<e->nScan(); j++ ){
@@ -735,7 +724,7 @@ void NManip::ScaExch(void)
         VTEST ((izco==(uint)-1), ("! no input z coordinate\n"));
         zcoin = fin->ZCo[izco];
 
-        doc = "exchanging x=" + xcoin.str() + " against z" + strg(izco)
+        doc = "msx # exchanging x=" + xcoin.str() + " against z" + strg(izco)
             + "=" + zcoin.str();
         cout << doc+"\n";
 	
@@ -815,7 +804,7 @@ void NManip::ScaSortByExpr( void )
 
         fout = *fin;
         fout.VS.clear();
-        fout.lDoc.push_back("mso according to "+expr);
+        fout.lDoc.push_back("mso "+expr);
 
         nj = fin->nScan();
         double v[nj];
@@ -1543,9 +1532,9 @@ void NManip::FilMerge(void)
     fout.lDoc.push_back(fnam + " is merger of:");
     fiter.Reset();
     while ((fin=fiter())) {
-        fout.lDoc.push_back("> " + fin->name);
+        fout.lDoc.push_back("  " + fin->name);
         for (uint i=0; i<fin->lDoc.size(); ++i)
-            fout.lDoc.push_back("> > " + fin->lDoc[i]);
+            fout.lDoc.push_back("    " + fin->lDoc[i]);
     }
 
     /** now merge the data **/
diff --git a/src/manip.h b/src/manip.h
index f0433a77354725ddd0a7a96077c8ba28f67115da..cd629982c15a4d5c0fde1c0dc5263042a7553273 100644
--- a/src/manip.h
+++ b/src/manip.h
@@ -1,12 +1,12 @@
 namespace NManip {
-    void PtsDelete();
+    void PtsSelect( string del_or_ret );
     void PtsAvge();
     void PtsBreak();
     void PtsSort();
     void PtsAvgeEq();
     void PtsRetainEqui();
     void PtsGroupWeighted();
-    void ScaDelete();
+    void ScaSelect( string del_or_ret );
     void ScaAvge();
     void ScaGridSimplify();
     void ScaBreak();
diff --git a/src/mystd.cpp b/src/mystd.cpp
index 6d4926bbc1b2e4ceab9c5a5f5a0cc6a05a32ee58..650ccc1bd80704528dd75cc575ff121eeb3ca72a 100644
--- a/src/mystd.cpp
+++ b/src/mystd.cpp
@@ -73,9 +73,11 @@ string yaml( const string s )
     }
     // if there are special characters, put ".." around
     if( s.find( '"' )!=string::npos ||
-        s.find( ':' )!=string::npos  ||
-        s.find( '*' )!=string::npos  ||
-        s.find( '&' )!=string::npos 
+        s.find( ':' )!=string::npos ||
+        s.find( '*' )!=string::npos ||
+        s.find( '&' )!=string::npos ||
+        s.find( '>' )!=string::npos ||
+        s.find( '<' )!=string::npos
         )
         out = '"' + out + '"';
     return out;
@@ -266,7 +268,7 @@ int mystd::any2int(const string inp, int *val)
     return -9;
 }
 
-void mystd::string_extract_word(const string in, string *out1, string *out2)
+void mystd::string_extract_word( const string in, string *out1, string *out2 )
 {
     // one word (*out1) is extracted; leading " \t" are retained.
     // in the tail (*out2) leading " \t" are deleted.
@@ -275,7 +277,8 @@ void mystd::string_extract_word(const string in, string *out1, string *out2)
 
     string::size_type j0=0, j1, j2, jf=in.size();
 
-    if (in[0]=='`') { // special case
+    // handle special case "`"
+    if (in[0]=='`') { 
         j1 = in.find_first_of('`', 1);
         if (j1==string::npos) {
             *out1 = in.substr(1);
diff --git a/src/opr.cpp b/src/opr.cpp
index 5de62066928b50fc84f0516ba082992dca86605d..4f3cfc483a8246c54bf97a790356110e0851d06a 100644
--- a/src/opr.cpp
+++ b/src/opr.cpp
@@ -88,7 +88,7 @@ void NOperate::Show( string subcmd )
 
 //! Delete or retain data points according to a boolean expression.
 
-void NOperate::Select(bool askdelete) 
+void NOperate::Select( bool askdelete )
 {
     static string expr;
     expr = sask((askdelete ? "Delete" : "Retain"), expr);
@@ -129,7 +129,7 @@ void NOperate::Select(bool askdelete)
         }            
         fin = ein->P();
         
-        ftmp->lDoc.push_back((askdelete ? "delete " : "retain ") + expr);
+        ftmp->lDoc.push_back((askdelete ? "md " : "mr ") + expr);
         
         for (uint j=0; j<ein->nScan(); j++) {
             // printf("DEBUG .. operate on scan %d\n", j);
@@ -197,7 +197,7 @@ void NOperate::Pointwise( string llabel )
             else
                 fout = (COlo*) new COlc( *((COlc*) ein->P()) );
         }
-        fout->lDoc.push_back(lref.ref_info() + " := " +expr);
+        fout->lDoc.push_back( "o" + lref.ref_info() + " " + expr);
         
         if      (lref.var==CRef::_X) 
             T.coord(&(fout->xco), k);
@@ -281,7 +281,7 @@ void NOperate::NewZ()
         }
         f = (COlo*) fin;
 
-        fout->lDoc.push_back("new z := " +expr);
+        fout->lDoc.push_back("oz+ " +expr);
         fout->ZCo.push_back(CCoord());
         CRef lref(string("z")+strg(fout->ZCo.size()-1));
         T.coord(&(fout->ZCo[lref.num]), k);
@@ -325,7 +325,7 @@ void NOperate::Integral(void)
         f = (COlo*) fin;
         fout.VS.clear();
         if (savable) {
-            fout.lDoc.push_back("oi> y := " +expr);
+            fout.lDoc.push_back("oi " +expr);
 
             zco = fin->ZCo.back();
             fout.ZCo.pop_back();
@@ -378,8 +378,8 @@ void NOperate::IntXY(void)
     if( icolx<0) return;
     icoly = iask( "y from column", icoly );
     if( icoly<0) return;
-    xco.Ask( "x coordinate", ASK_DEF_GIVEN, xco );
-    yco.Ask( "y coordinate", ASK_DEF_GIVEN, yco );
+    xco = CCoord( "x", "" ); // .Ask( "x coordinate", ASK_DEF_GIVEN, xco );
+    yco = CCoord( "y", "" ); // .Ask( "y coordinate", ASK_DEF_GIVEN, yco );
 
     NOlm::IterateD fiter;
     if (!NOlm::overwrite) NOlm::SelNew();
@@ -397,8 +397,7 @@ void NOperate::IntXY(void)
         fout = *fin;
         f = (COlo*) fin;
         fout.VS.clear();
-        fout.lDoc.push_back( "oixy: x from y["+strg(icolx)+"], y from y["+
-                             strg(icoly)+"]" );
+        fout.lDoc.push_back( "oixy " + strg(icolx) + " " + strg(icoly) );
         fout.ZCo.pop_back();
         fout.xco = xco;
         fout.yco = yco;
@@ -800,6 +799,7 @@ int NFunctional::Deriv(int fno, COld *fin, COld *fout)
 {
     fout->yco.name = "d" + fin->yco.name + " / d" + fin->xco.name;
     fout->yco.unit = fin->yco.unit + " / " + fin->xco.unit;
+    fout->lDoc.push_back( "ofd" );
 
     CGrid *xin, *xout;
     vector<double> *yin, *yout;
@@ -823,6 +823,7 @@ int NFunctional::Integr(int fno, COld *fin, COld *fout)
 {
     fout->yco.name = "Int d" + fin->xco.name + " " + fin->yco.name;
     fout->yco.unit = fin->xco.unit + " * " + fin->yco.unit;
+    fout->lDoc.push_back( "ofi" );
 
     CGrid *xin;
     vector<double> *yin, *yout;
@@ -848,6 +849,7 @@ int NFunctional::Autocorr(int fno, COld *fin, COld *fout)
 {
     fout->yco.name = "ac{" + fin->yco.name + "}";
     fout->yco.unit = fin->yco.unit + "^2";
+    fout->lDoc.push_back( "ofac" );
 
     CGrid *xin;
     vector<double> *yin;
@@ -1022,7 +1024,7 @@ void NIntOld::Opr(void)
             cout << "PROGRAM ERROR not implemented\n";
             return;
         }
-        fout.lDoc.push_back( "oio "+strg(mod)+": y = "+fout.yco.name );
+        fout.lDoc.push_back( "oio "+strg(mod)+" # y = "+fout.yco.name );
 
         S.Clear();
         S.z = fin->VS[0].z;
diff --git a/src/readln.cpp b/src/readln.cpp
index 1364596677f5db71776ddf4cf22d6e227543b9af..a060c085d570a980d3a8edf381b1cc66e2cb059b 100644
--- a/src/readln.cpp
+++ b/src/readln.cpp
@@ -113,7 +113,7 @@ string NRead::readwd( const string& prompt )
         halfline = readln(prompt);
     }
 
-    mystd::string_extract_word(halfline, &ret, &h);
+    mystd::string_extract_word( halfline, &ret, &h );
     halfline = h;
     return ret;
 }
@@ -213,6 +213,12 @@ string NRead::readline_interface( const string prompt )
     add_history(rr);  // from libhistory
     r = string(rr);
     free(rr);
+
+    // eliminate comments
+    for( string::size_type jh=0; jh<r.size(); ++jh )
+        if( r[jh]=='#' && ( jh==0 || r[jh-1]!='\\' ) )
+            return r.substr( 0, jh );
+
     return r;
 }
 
diff --git a/src/rssm.cpp b/src/rssm.cpp
index 0d6d037dcad42929b08625d0b50ffb389a0143f9..b9681b8db9326f120ad95cdeb65b5a6ab07b33b7 100644
--- a/src/rssm.cpp
+++ b/src/rssm.cpp
@@ -468,9 +468,8 @@ void NRSSM::ReadScan( int format, int flag )
 
     COld olf[8];
     int iolf;
-
+    
     for( iolf=0; iolf<8; ++iolf ){
-        olf[iolf].lDoc.push_back( "acquire data from "+file_f );
         olf[iolf].xco = iolf<4 ||iolf>5 ?
             CCoord( "E", "ueV" ) : CCoord( "phase", "deg" );
         olf[iolf].yco = CCoord( "cts", "sec-1" );
@@ -485,14 +484,15 @@ void NRSSM::ReadScan( int format, int flag )
     olf[5].name = name+"chop_inela";
     olf[6].name = name;
     olf[7].name = name+"open";
-    olf[0].lDoc.push_back( "refl, left halfspace" );
-    olf[1].lDoc.push_back( "refl, right halfspace" );
-    olf[2].lDoc.push_back( "open, left halfspace" );
-    olf[3].lDoc.push_back( "open, right halfspace" );
-    olf[4].lDoc.push_back( "elastic region" );
-    olf[5].lDoc.push_back( "inelastic region" );
-    olf[6].lDoc.push_back( "refl, average over both halfspaces" );
-    olf[7].lDoc.push_back( "open, average over both halfspaces" );
+    string doc = "ry" + (flag==0 ? "" : strg(flag+1)) + " " + file_f;
+    olf[0].lDoc.push_back( doc + " # refl, left halfspace" );
+    olf[1].lDoc.push_back( doc + " # refl, right halfspace" );
+    olf[2].lDoc.push_back( doc + " # open, left halfspace" );
+    olf[3].lDoc.push_back( doc + " # open, right halfspace" );
+    olf[4].lDoc.push_back( doc + " # elastic" );
+    olf[5].lDoc.push_back( doc + " # inelastic" );
+    olf[6].lDoc.push_back( doc + " # refl" );
+    olf[7].lDoc.push_back( doc + " # open" );
 
     CScan S;
     for( int j=0; j<ndet; ++j ){
diff --git a/yaml/config.log b/yaml/config.log
index f8efa5e133d4b6e8aaedb97b24191d106720cf67..6f7a4a127125b4c365936a7c2e5b8661afc4b2bf 100644
--- a/yaml/config.log
+++ b/yaml/config.log
@@ -774,3 +774,21 @@ target_alias=''
 #define HAVE_STDLIB_H 1
 
 configure: exit 0
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by yaml config.status 0.0.1, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status config.h
+
+on saft.jcns.frm2
+
+config.status:669: creating config.h
+config.status:896: config.h is unchanged
diff --git a/yaml/src/.deps/api.Plo b/yaml/src/.deps/api.Plo
index f945a975e9192ca53bae2135e4145217cef7da57..1f0bdd07e09e2f4294b91206c8f59efd705e2eb1 100644
--- a/yaml/src/.deps/api.Plo
+++ b/yaml/src/.deps/api.Plo
@@ -1,8 +1,8 @@
-api.lo api.o: api.c yaml_private.h ../config.h ../include/yaml.h \
+api.lo: api.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ api.lo api.o: api.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.deps/emitter.Plo b/yaml/src/.deps/emitter.Plo
index 29abe803f0bc1bb6b1e2280645818ed5d3e1f522..c13de22c6e385f0fb52ea941c675d0d7d72354d2 100644
--- a/yaml/src/.deps/emitter.Plo
+++ b/yaml/src/.deps/emitter.Plo
@@ -1,8 +1,8 @@
-emitter.lo emitter.o: emitter.c yaml_private.h ../config.h \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+emitter.lo: emitter.c yaml_private.h ../config.h ../include/yaml.h \
+  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+  /usr/include/gnu/stubs-32.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ emitter.lo emitter.o: emitter.c yaml_private.h ../config.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.deps/parser.Plo b/yaml/src/.deps/parser.Plo
index 1a00d711c9d39abee36264dec7d0eec7b2076b18..276cb2309095595dba65e3839f3392cb1f3690d4 100644
--- a/yaml/src/.deps/parser.Plo
+++ b/yaml/src/.deps/parser.Plo
@@ -1,8 +1,8 @@
-parser.lo parser.o: parser.c yaml_private.h ../config.h ../include/yaml.h \
+parser.lo: parser.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ parser.lo parser.o: parser.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.deps/reader.Plo b/yaml/src/.deps/reader.Plo
index 341aa6c6551174dd1dc228a9352b78f085483100..02af16d4f8247df95ff5c5a5c098c780e76ccb87 100644
--- a/yaml/src/.deps/reader.Plo
+++ b/yaml/src/.deps/reader.Plo
@@ -1,8 +1,8 @@
-reader.lo reader.o: reader.c yaml_private.h ../config.h ../include/yaml.h \
+reader.lo: reader.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ reader.lo reader.o: reader.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.deps/scanner.Plo b/yaml/src/.deps/scanner.Plo
index e13d8d54c715ce6c9a56bf5c614355f2d5842263..f8b6778a76b99cb6d6434fc35b35bf14a2fe1168 100644
--- a/yaml/src/.deps/scanner.Plo
+++ b/yaml/src/.deps/scanner.Plo
@@ -1,8 +1,8 @@
-scanner.lo scanner.o: scanner.c yaml_private.h ../config.h \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+scanner.lo: scanner.c yaml_private.h ../config.h ../include/yaml.h \
+  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+  /usr/include/gnu/stubs-32.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ scanner.lo scanner.o: scanner.c yaml_private.h ../config.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.deps/writer.Plo b/yaml/src/.deps/writer.Plo
index 560b2ceca3154e57067410fbcf95554dc3b42c86..9c3bd145271e1e9ca164991823964df9e5f68caf 100644
--- a/yaml/src/.deps/writer.Plo
+++ b/yaml/src/.deps/writer.Plo
@@ -1,8 +1,8 @@
-writer.lo writer.o: writer.c yaml_private.h ../config.h ../include/yaml.h \
+writer.lo: writer.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,13 +10,13 @@ writer.lo writer.o: writer.c yaml_private.h ../config.h ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
   /usr/include/assert.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h
@@ -39,7 +39,7 @@ yaml_private.h:
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -75,7 +75,7 @@ yaml_private.h:
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
@@ -91,9 +91,9 @@ yaml_private.h:
 
 /usr/include/assert.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/limits.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
diff --git a/yaml/src/.libs/libyaml-0.so.0.0.0 b/yaml/src/.libs/libyaml-0.so.0.0.0
index 7d93ec3e10a7d4464ff2d4051ee85afd0ecd2d9d..d81d429578218d933952521b43f00ab26076bb8a 100755
Binary files a/yaml/src/.libs/libyaml-0.so.0.0.0 and b/yaml/src/.libs/libyaml-0.so.0.0.0 differ
diff --git a/yaml/src/.libs/libyaml.a b/yaml/src/.libs/libyaml.a
index 17ade19a63d35a3a897665df12eff5aa50122c97..a13fdc7930d00a5283cb1f8decf5325fedd46829 100644
Binary files a/yaml/src/.libs/libyaml.a and b/yaml/src/.libs/libyaml.a differ
diff --git a/yaml/src/libyaml.a b/yaml/src/libyaml.a
deleted file mode 100644
index c05d8a97879949fd2934f7fb3ba46c1b0268fde0..0000000000000000000000000000000000000000
Binary files a/yaml/src/libyaml.a and /dev/null differ
diff --git a/yaml/tests/.deps/example-deconstructor.Po b/yaml/tests/.deps/example-deconstructor.Po
index e91497a3717e331803bfe2b3360c3d82c635b2d0..47a9ea4c70073da8ba173455302c9bb80715bf3b 100644
--- a/yaml/tests/.deps/example-deconstructor.Po
+++ b/yaml/tests/.deps/example-deconstructor.Po
@@ -1,8 +1,8 @@
-example-deconstructor.o example-deconstructor.o: example-deconstructor.c \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+example-deconstructor.o: example-deconstructor.c ../include/yaml.h \
+  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+  /usr/include/gnu/stubs-32.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,7 +10,7 @@ example-deconstructor.o example-deconstructor.o: example-deconstructor.c \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h
@@ -29,7 +29,7 @@ example-deconstructor.o example-deconstructor.o: example-deconstructor.c \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -65,7 +65,7 @@ example-deconstructor.o example-deconstructor.o: example-deconstructor.c \
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/yaml/tests/.deps/example-reformatter.Po b/yaml/tests/.deps/example-reformatter.Po
index ea0f8d11020e0ce36ff1748a0660dafe1be95263..09739e63ec2c2d14b59dc35cf1824c90eb7a561a 100644
--- a/yaml/tests/.deps/example-reformatter.Po
+++ b/yaml/tests/.deps/example-reformatter.Po
@@ -1,8 +1,8 @@
-example-reformatter.o example-reformatter.o: example-reformatter.c \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+example-reformatter.o: example-reformatter.c ../include/yaml.h \
+  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+  /usr/include/gnu/stubs-32.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,7 +10,7 @@ example-reformatter.o example-reformatter.o: example-reformatter.c \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h
@@ -29,7 +29,7 @@ example-reformatter.o example-reformatter.o: example-reformatter.c \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -65,7 +65,7 @@ example-reformatter.o example-reformatter.o: example-reformatter.c \
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/yaml/tests/.deps/run-emitter.Po b/yaml/tests/.deps/run-emitter.Po
index bc685389839d3f716271e70fc098ffba4380c27a..afd9d89773f5b781824677c15974fddcd629863e 100644
--- a/yaml/tests/.deps/run-emitter.Po
+++ b/yaml/tests/.deps/run-emitter.Po
@@ -1,8 +1,8 @@
-run-emitter.o run-emitter.o: run-emitter.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+run-emitter.o: run-emitter.c ../include/yaml.h /usr/include/stdlib.h \
+  /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,7 +10,7 @@ run-emitter.o run-emitter.o: run-emitter.c ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
@@ -30,7 +30,7 @@ run-emitter.o run-emitter.o: run-emitter.c ../include/yaml.h \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -66,7 +66,7 @@ run-emitter.o run-emitter.o: run-emitter.c ../include/yaml.h \
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/yaml/tests/.deps/run-parser.Po b/yaml/tests/.deps/run-parser.Po
index 14f37c62cee74441a7f0976b70f760346d168613..0784ddc718ece3a0424b6973ef0d8fb990a21816 100644
--- a/yaml/tests/.deps/run-parser.Po
+++ b/yaml/tests/.deps/run-parser.Po
@@ -1,8 +1,8 @@
-run-parser.o run-parser.o: run-parser.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+run-parser.o: run-parser.c ../include/yaml.h /usr/include/stdlib.h \
+  /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,7 +10,7 @@ run-parser.o run-parser.o: run-parser.c ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
@@ -30,7 +30,7 @@ run-parser.o run-parser.o: run-parser.c ../include/yaml.h \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -66,7 +66,7 @@ run-parser.o run-parser.o: run-parser.c ../include/yaml.h \
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/yaml/tests/.deps/run-scanner.Po b/yaml/tests/.deps/run-scanner.Po
index 3add70b758696a99f852aacb037d414f1a302b3c..13b43988cbc7a7f85451049572c45ccb43bc7de6 100644
--- a/yaml/tests/.deps/run-scanner.Po
+++ b/yaml/tests/.deps/run-scanner.Po
@@ -1,8 +1,8 @@
-run-scanner.o run-scanner.o: run-scanner.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+run-scanner.o: run-scanner.c ../include/yaml.h /usr/include/stdlib.h \
+  /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
   /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h \
   /usr/include/sys/types.h /usr/include/bits/types.h \
   /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
   /usr/include/bits/endian.h /usr/include/sys/select.h \
@@ -10,7 +10,7 @@ run-scanner.o run-scanner.o: run-scanner.c ../include/yaml.h \
   /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
   /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
   /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \
+  /usr/include/wchar.h /usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
   /usr/include/bits/stdio.h /usr/include/string.h \
   /usr/include/bits/string.h /usr/include/bits/string2.h \
@@ -30,7 +30,7 @@ run-scanner.o run-scanner.o: run-scanner.c ../include/yaml.h \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stddef.h:
 
 /usr/include/sys/types.h:
 
@@ -66,7 +66,7 @@ run-scanner.o run-scanner.o: run-scanner.c ../include/yaml.h \
 
 /usr/include/wchar.h:
 
-/usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.2/include/stdarg.h:
 
 /usr/include/bits/stdio_lim.h:
 
diff --git a/yaml/tests/.libs/example-deconstructor b/yaml/tests/.libs/example-deconstructor
index e8010b7162ea604981f8e90c981cbedb743a6ff3..4fcb405390b0c6a521b4613e6394984e8e2d824e 100755
Binary files a/yaml/tests/.libs/example-deconstructor and b/yaml/tests/.libs/example-deconstructor differ
diff --git a/yaml/tests/.libs/example-reformatter b/yaml/tests/.libs/example-reformatter
index 3c1922eb1a9f7be07646194bbc2927af56fb9f82..7a4dbf3f23d09f5ec43db64be32f28ff94f8bc23 100755
Binary files a/yaml/tests/.libs/example-reformatter and b/yaml/tests/.libs/example-reformatter differ
diff --git a/yaml/tests/.libs/run-emitter b/yaml/tests/.libs/run-emitter
index 42094c99ef9504d99bfcd8dbca6e093ab957dfa0..f1d59789b41d9f01b6cd165d59824aa527c1f46a 100755
Binary files a/yaml/tests/.libs/run-emitter and b/yaml/tests/.libs/run-emitter differ
diff --git a/yaml/tests/.libs/run-parser b/yaml/tests/.libs/run-parser
index 197e986c598ae88d7e8e2bb1dc9bace360957a8d..a6039a5c8ef8e33e49134ac4c8b9e6fcc020d687 100755
Binary files a/yaml/tests/.libs/run-parser and b/yaml/tests/.libs/run-parser differ
diff --git a/yaml/tests/.libs/run-scanner b/yaml/tests/.libs/run-scanner
index 9171cceec49a6aaa3c768c29374f68bc05ec1833..ac493aab4650cc1c307ba669e8c8cdd24193c5e7 100755
Binary files a/yaml/tests/.libs/run-scanner and b/yaml/tests/.libs/run-scanner differ