Index: /source/ariba/utility/internal/Utilities.hpp
===================================================================
--- /source/ariba/utility/internal/Utilities.hpp	(revision 7522)
+++ /source/ariba/utility/internal/Utilities.hpp	(revision 7523)
@@ -40,4 +40,5 @@
 #define UTILITIES_HPP_
 
+#include "ariba/config.h"
 #include <boost/cstdint.hpp>
 #include <boost/type_traits.hpp>
@@ -46,5 +47,9 @@
 /* force inline macro */
 #ifndef finline
-#define finline inline __attribute__((always_inline))
+	#ifdef HAVE_MAEMO
+		#define finline inline
+	#else
+		#define finline inline __attribute__((always_inline))
+	#endif
 #endif
 
Index: /source/ariba/utility/serialization/Data.hpp
===================================================================
--- /source/ariba/utility/serialization/Data.hpp	(revision 7522)
+++ /source/ariba/utility/serialization/Data.hpp	(revision 7523)
@@ -351,5 +351,5 @@
 	}
 public:
-	DefaultDataModel() {
+	finline DefaultDataModel() {
 		bufferPtr = NULL;
 		bufferLen = -1;