Check out the latest version of Routino: svn co http://routino.org/svn/trunk routino
Put some of types.h into typesx.h (for extended data types). Put some of functions.h into functionsx.h (for OSM parser). Change included files to match.