diff --git a/doc/mainpage.dox.in b/doc/mainpage.dox.in
index 732f7540..8531aee6 100644
--- a/doc/mainpage.dox.in
+++ b/doc/mainpage.dox.in
@@ -1,5 +1,5 @@
 /*
- * $Id: mainpage.dox.cmake 2011-09-21 Mickael Savinaud $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
diff --git a/doc/openjpip.dox.in b/doc/openjpip.dox.in
index 76bc5d2a..695cb686 100644
--- a/doc/openjpip.dox.in
+++ b/doc/openjpip.dox.in
@@ -1,5 +1,5 @@
 /*
- * $Id: mainpage.h 47 2011-02-17 16:57:49Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*! \page openjpippage OpenJPIP v2.1 Documentation
+/*! \page openjpippage OpenJPIP v@OPENJPEG_VERSION@ Documentation
  *
  * \section intro Introduction
  * This manual documents the low-level OpenJPIP C API.\n
@@ -36,12 +36,11 @@
  * ( For more info about JPIP, check the website: http://www.jpeg.org/jpeg2000/j2kpart9.html)\n
  *
  * This whole documents covers the following six programs.\n
- * - opj_server.c     JPIP server supporting HTTP connection and JPT/JPP-stream
- * - opj_dec_server.c Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
- * - addXMLinJP2.c    To Embed metadata into JP2 file
- * - jpip_to_jp2.c    To Convert JPT/JPP-stream to JP2
- * - jpip_to_j2k.c    To Convert JPT/JPP-stream to J2K
- * - test_index.c     To test index code format of a JP2 file
+ * - opj_server.c          JPIP server supporting HTTP connection and JPT/JPP-stream
+ * - opj_dec_server.c      Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
+ * - opj_jpip_addxml.c     To Embed metadata into JP2 file
+ * - opj_jpip_transcode.c  To Convert JPT/JPP-stream to JP2 or J2K
+ * - opj_jpip_test.c       To test index code format of a JP2 file
  *
  * \section license License
  * This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n
diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index 6a411a03..6106e0d2 100644
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -47,14 +47,7 @@ set(EXES
   opj_jpip_test
   )
 foreach(exe ${EXES})
-  if(${exe} STREQUAL "opj_jpip_transcode")
-    add_executable(${exe} ${exe}.c
-      jpip_to_jp2.c
-      jpip_to_j2k.c
-    )
-  else()
-    add_executable(${exe} ${exe}.c)
-  endif()
+  add_executable(${exe} ${exe}.c)
   target_link_libraries(${exe} openjpip_local)
   install(TARGETS ${exe}
     EXPORT OpenJPEGTargets
diff --git a/src/bin/jpip/jpip_to_j2k.c b/src/bin/jpip/jpip_to_j2k.c
deleted file mode 100644
index 0f64715e..00000000
--- a/src/bin/jpip/jpip_to_j2k.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief jpip_to_j2k is a program to convert JPT- JPP- stream to J2K file
- *
- *  \section impinst Implementing instructions
- *  This program takes two arguments. \n
- *   -# Input  JPT or JPP file
- *   -# Output J2K file\n
- *   % ./jpip_to_j2k input.jpt output.j2k
- *   or
- *   % ./jpip_to_j2k input.jpp output.j2k
- */
-
-#include <stdio.h>
-#include "openjpip.h"
-
-int jpip_to_j2k(int argc,char *argv[])
-{
-  jpip_dec_param_t *dec;
-  
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output j2k file\n");
-    return -1;
-  }
-  
-  dec = init_jpipdecoder( false);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return -1;
-  
-  decode_jpip( dec);
-  
-  if(!( fwrite_jp2k( argv[2], dec)))
-    return -1;
-  
-  /*  output_log( true, false, false, dec); */
-  
-  destroy_jpipdecoder( &dec);
-
-  return 0;
-}
diff --git a/src/bin/jpip/jpip_to_jp2.c b/src/bin/jpip/jpip_to_jp2.c
deleted file mode 100644
index 138fc8ac..00000000
--- a/src/bin/jpip/jpip_to_jp2.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
- *
- *  \section impinst Implementing instructions
- *  This program takes two arguments. \n
- *   -# Input JPT or JPP file
- *   -# Output JP2 file\n
- *   % ./jpip_to_jp2 input.jpt output.jp2
- *   or
- *   % ./jpip_to_jp2 input.jpp output.jp2
- */
-
-#include <stdio.h>
-#include "openjpip.h"
-
-int jpip_to_jp2(int argc,char *argv[])
-{
-  jpip_dec_param_t *dec;
-    
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output jp2 file\n");
-    return -1;
-  }
-  
-  dec = init_jpipdecoder( true);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return -1;
-  
-  decode_jpip( dec);
-  
-  if(!(fwrite_jp2k( argv[2], dec)))
-    return -1;
-
-  output_log( true, false, true, dec);
-
-  destroy_jpipdecoder( &dec);
-
-  return 0;
-}
diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c
index 4bb8b354..55ec2182 100644
--- a/src/bin/jpip/opj_jpip_transcode.c
+++ b/src/bin/jpip/opj_jpip_transcode.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2012, Mathieu Malaterre
+ * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,19 +28,86 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdio.h>
+#include "openjpip.h"
+
 /*! \file
- *  \brief opj_jpip_transcode is a program to convert JPT- JPP- stream to J2K/JP2 file
+ *  \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
+ *
+ *  \section impinst Implementing instructions
+ *  This program takes two arguments. \n
+ *   -# Input JPT or JPP file
+ *   -# Output JP2 file\n
+ *   % ./jpip_to_jp2 input.jpt output.jp2
+ *   or
+ *   % ./jpip_to_jp2 input.jpp output.jp2
+ */
+static int jpip_to_jp2(int argc,char *argv[])
+{
+  jpip_dec_param_t *dec;
+    
+  if( argc < 3){
+    fprintf( stderr, "Too few arguments:\n");
+    fprintf( stderr, " - input  jpt or jpp file\n");
+    fprintf( stderr, " - output jp2 file\n");
+    return -1;
+  }
+  
+  dec = init_jpipdecoder( true);
+  
+  if(!( fread_jpip( argv[1], dec)))
+    return -1;
+  
+  decode_jpip( dec);
+  
+  if(!(fwrite_jp2k( argv[2], dec)))
+    return -1;
+
+  output_log( true, false, true, dec);
+
+  destroy_jpipdecoder( &dec);
+
+  return 0;
+}
+
+/*! \file
+ *  \brief jpip_to_j2k is a program to convert JPT- JPP- stream to J2K file
  *
  *  \section impinst Implementing instructions
  *  This program takes two arguments. \n
  *   -# Input  JPT or JPP file
  *   -# Output J2K file\n
- *   % ./opj_jpip_transcode input.jpt output.j2k
+ *   % ./jpip_to_j2k input.jpt output.j2k
  *   or
  *   % ./jpip_to_j2k input.jpp output.j2k
  */
-extern int jpip_to_j2k(int argc,char *argv[]);
-extern int jpip_to_jp2(int argc,char *argv[]);
+static int jpip_to_j2k(int argc,char *argv[])
+{
+  jpip_dec_param_t *dec;
+  
+  if( argc < 3){
+    fprintf( stderr, "Too few arguments:\n");
+    fprintf( stderr, " - input  jpt or jpp file\n");
+    fprintf( stderr, " - output j2k file\n");
+    return -1;
+  }
+  
+  dec = init_jpipdecoder( false);
+  
+  if(!( fread_jpip( argv[1], dec)))
+    return -1;
+  
+  decode_jpip( dec);
+  
+  if(!( fwrite_jp2k( argv[2], dec)))
+    return -1;
+  
+  /*  output_log( true, false, false, dec); */
+  
+  destroy_jpipdecoder( &dec);
+
+  return 0;
+}
 
 int main(int argc,char *argv[])
 {
diff --git a/src/lib/openjpip/box_manager.c b/src/lib/openjpip/box_manager.c
index 87bb7756..00d8edca 100644
--- a/src/lib/openjpip/box_manager.c
+++ b/src/lib/openjpip/box_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: box_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/box_manager.h b/src/lib/openjpip/box_manager.h
index 88cd5336..7b4a9377 100644
--- a/src/lib/openjpip/box_manager.h
+++ b/src/lib/openjpip/box_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: box_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/boxheader_manager.c b/src/lib/openjpip/boxheader_manager.c
index b345a96d..98b32d31 100644
--- a/src/lib/openjpip/boxheader_manager.c
+++ b/src/lib/openjpip/boxheader_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: boxheader_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/boxheader_manager.h b/src/lib/openjpip/boxheader_manager.h
index f8e48f39..91092df9 100644
--- a/src/lib/openjpip/boxheader_manager.h
+++ b/src/lib/openjpip/boxheader_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: boxheader_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/byte_manager.c b/src/lib/openjpip/byte_manager.c
index 502c26bd..cac02b5f 100644
--- a/src/lib/openjpip/byte_manager.c
+++ b/src/lib/openjpip/byte_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: byte_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/byte_manager.h b/src/lib/openjpip/byte_manager.h
index 0a29503e..696c1f69 100644
--- a/src/lib/openjpip/byte_manager.h
+++ b/src/lib/openjpip/byte_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: byte_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/cache_manager.c b/src/lib/openjpip/cache_manager.c
index 76f7b7b3..ce8e012a 100644
--- a/src/lib/openjpip/cache_manager.c
+++ b/src/lib/openjpip/cache_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/cache_manager.h b/src/lib/openjpip/cache_manager.h
index 0c9afb0b..ad6a13f5 100644
--- a/src/lib/openjpip/cache_manager.h
+++ b/src/lib/openjpip/cache_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/channel_manager.c b/src/lib/openjpip/channel_manager.c
index 313f8ced..8060d680 100644
--- a/src/lib/openjpip/channel_manager.c
+++ b/src/lib/openjpip/channel_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: channel_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/channel_manager.h b/src/lib/openjpip/channel_manager.h
index 79cc0160..b1aeb2b4 100644
--- a/src/lib/openjpip/channel_manager.h
+++ b/src/lib/openjpip/channel_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: channel_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/codestream_manager.c b/src/lib/openjpip/codestream_manager.c
index d7797c13..27ae5e1a 100644
--- a/src/lib/openjpip/codestream_manager.c
+++ b/src/lib/openjpip/codestream_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: codestream_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/codestream_manager.h b/src/lib/openjpip/codestream_manager.h
index b600d8e5..d671a6ed 100644
--- a/src/lib/openjpip/codestream_manager.h
+++ b/src/lib/openjpip/codestream_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: codestream_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/faixbox_manager.c b/src/lib/openjpip/faixbox_manager.c
index 3c443832..bfc3d4d3 100644
--- a/src/lib/openjpip/faixbox_manager.c
+++ b/src/lib/openjpip/faixbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: faixbox_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/faixbox_manager.h b/src/lib/openjpip/faixbox_manager.h
index 45ea8c3e..bf4a02a6 100644
--- a/src/lib/openjpip/faixbox_manager.h
+++ b/src/lib/openjpip/faixbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: faixbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c
index d501b612..85bbf76a 100644
--- a/src/lib/openjpip/ihdrbox_manager.c
+++ b/src/lib/openjpip/ihdrbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ihdrbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/ihdrbox_manager.h b/src/lib/openjpip/ihdrbox_manager.h
index 9fa9a830..1e112ff3 100644
--- a/src/lib/openjpip/ihdrbox_manager.h
+++ b/src/lib/openjpip/ihdrbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ihdrbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/imgreg_manager.c b/src/lib/openjpip/imgreg_manager.c
index 3a713c32..15b24a46 100644
--- a/src/lib/openjpip/imgreg_manager.c
+++ b/src/lib/openjpip/imgreg_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: imgreg_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/imgreg_manager.h b/src/lib/openjpip/imgreg_manager.h
index 7967120b..cca4df17 100644
--- a/src/lib/openjpip/imgreg_manager.h
+++ b/src/lib/openjpip/imgreg_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: imgreg_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/imgsock_manager.c b/src/lib/openjpip/imgsock_manager.c
index 612cb378..b3b200c6 100644
--- a/src/lib/openjpip/imgsock_manager.c
+++ b/src/lib/openjpip/imgsock_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: imgsock_manager.c 54 2011-05-10 13:22:47Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/imgsock_manager.h b/src/lib/openjpip/imgsock_manager.h
index 044bdc53..88ab1d33 100644
--- a/src/lib/openjpip/imgsock_manager.h
+++ b/src/lib/openjpip/imgsock_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: imgsock_manager.h 54 2011-05-10 13:22:47Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/index_manager.c b/src/lib/openjpip/index_manager.c
index 6f8357e9..e4812226 100644
--- a/src/lib/openjpip/index_manager.c
+++ b/src/lib/openjpip/index_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: index_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/index_manager.h b/src/lib/openjpip/index_manager.h
index c1969fac..a9f141c8 100644
--- a/src/lib/openjpip/index_manager.h
+++ b/src/lib/openjpip/index_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: index_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
index 9d619b09..4d731b7a 100644
--- a/src/lib/openjpip/jp2k_decoder.c
+++ b/src/lib/openjpip/jp2k_decoder.c
@@ -1,5 +1,5 @@
 /*
- * $Id: jp2k_decoder.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/jp2k_decoder.h b/src/lib/openjpip/jp2k_decoder.h
index c999cdf1..a53b1537 100644
--- a/src/lib/openjpip/jp2k_decoder.h
+++ b/src/lib/openjpip/jp2k_decoder.h
@@ -1,5 +1,5 @@
 /*
- * $Id: jp2k_decoder.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/manfbox_manager.c b/src/lib/openjpip/manfbox_manager.c
index 37472461..8743eb5d 100644
--- a/src/lib/openjpip/manfbox_manager.c
+++ b/src/lib/openjpip/manfbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: manfbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/manfbox_manager.h b/src/lib/openjpip/manfbox_manager.h
index ed4189e0..04cf0775 100644
--- a/src/lib/openjpip/manfbox_manager.h
+++ b/src/lib/openjpip/manfbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: manfbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/marker_manager.c b/src/lib/openjpip/marker_manager.c
index 766ecd6e..92ff8b13 100644
--- a/src/lib/openjpip/marker_manager.c
+++ b/src/lib/openjpip/marker_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: marker_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/marker_manager.h b/src/lib/openjpip/marker_manager.h
index 68ea2a8b..4d01e353 100644
--- a/src/lib/openjpip/marker_manager.h
+++ b/src/lib/openjpip/marker_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: marker_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/metadata_manager.c b/src/lib/openjpip/metadata_manager.c
index 12b61efc..6cf32abd 100644
--- a/src/lib/openjpip/metadata_manager.c
+++ b/src/lib/openjpip/metadata_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: metadata_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/metadata_manager.h b/src/lib/openjpip/metadata_manager.h
index 089b19a5..3bed8d0e 100644
--- a/src/lib/openjpip/metadata_manager.h
+++ b/src/lib/openjpip/metadata_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: metadata_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/mhixbox_manager.c b/src/lib/openjpip/mhixbox_manager.c
index b311126b..6dc72c4c 100644
--- a/src/lib/openjpip/mhixbox_manager.c
+++ b/src/lib/openjpip/mhixbox_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mhixbox_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/mhixbox_manager.h b/src/lib/openjpip/mhixbox_manager.h
index 5905b25f..2c6d51c7 100644
--- a/src/lib/openjpip/mhixbox_manager.h
+++ b/src/lib/openjpip/mhixbox_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mhixbox_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c
index 29b64a26..31d3991f 100644
--- a/src/lib/openjpip/msgqueue_manager.c
+++ b/src/lib/openjpip/msgqueue_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: msgqueue_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/msgqueue_manager.h b/src/lib/openjpip/msgqueue_manager.h
index e54f2dc1..40548d91 100644
--- a/src/lib/openjpip/msgqueue_manager.h
+++ b/src/lib/openjpip/msgqueue_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: msgqueue_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/placeholder_manager.c b/src/lib/openjpip/placeholder_manager.c
index 4a37a13b..e3cadaa1 100644
--- a/src/lib/openjpip/placeholder_manager.c
+++ b/src/lib/openjpip/placeholder_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: placeholder_manager.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/placeholder_manager.h b/src/lib/openjpip/placeholder_manager.h
index ced20854..0177b68a 100644
--- a/src/lib/openjpip/placeholder_manager.h
+++ b/src/lib/openjpip/placeholder_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: placeholder_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/query_parser.c b/src/lib/openjpip/query_parser.c
index 460a5eb6..20f38b69 100644
--- a/src/lib/openjpip/query_parser.c
+++ b/src/lib/openjpip/query_parser.c
@@ -1,5 +1,5 @@
 /*
- * $Id: query_parser.c 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/query_parser.h b/src/lib/openjpip/query_parser.h
index d60cafe6..cea9ed23 100644
--- a/src/lib/openjpip/query_parser.h
+++ b/src/lib/openjpip/query_parser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: query_parser.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/session_manager.c b/src/lib/openjpip/session_manager.c
index 5c1d7588..5d9dd73e 100644
--- a/src/lib/openjpip/session_manager.c
+++ b/src/lib/openjpip/session_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/session_manager.h b/src/lib/openjpip/session_manager.h
index 03df4f4b..655d8506 100644
--- a/src/lib/openjpip/session_manager.h
+++ b/src/lib/openjpip/session_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: session_manager.h 53 2011-05-09 16:55:39Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/target_manager.c b/src/lib/openjpip/target_manager.c
index 8b4763a5..72d2f564 100644
--- a/src/lib/openjpip/target_manager.c
+++ b/src/lib/openjpip/target_manager.c
@@ -1,5 +1,5 @@
 /*
- * $Id: target_manager.c 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq
diff --git a/src/lib/openjpip/target_manager.h b/src/lib/openjpip/target_manager.h
index 275adc4a..85259548 100644
--- a/src/lib/openjpip/target_manager.h
+++ b/src/lib/openjpip/target_manager.h
@@ -1,5 +1,5 @@
 /*
- * $Id: target_manager.h 44 2011-02-15 12:32:29Z kaori $
+ * $Id$
  *
  * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2011, Professor Benoit Macq