Some macros declarations were missing, so we duplicate them. See the added patch description for more information. ----> THIS IS A DIRTY HACK! <---- Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>