diff --git a/lib/orogen/marshallers/type_info.rb b/lib/orogen/marshallers/type_info.rb
index d558ae3..32e097c 100644
--- a/lib/orogen/marshallers/type_info.rb
+++ b/lib/orogen/marshallers/type_info.rb
@@ -83,7 +83,7 @@ module Orocos
                 result = []
                 each_field do |field_name, field_type|
                     if field_type < Typelib::ArrayType
-                        result << "a & make_nvp(\"#{field_name}\", make_array(b.#{field_name}, #{field_type.length}));"
+                        result << "a & make_nvp(\"#{field_name}\", boost::serialization::make_array(b.#{field_name}, #{field_type.length}));"
                     else
                         result << "a & make_nvp(\"#{field_name}\", b.#{field_name});"
                     end
diff --git a/lib/orogen/templates/typekit/Types.hpp b/lib/orogen/templates/typekit/Types.hpp
index 2aa4f2f..eaa47cc 100644
--- a/lib/orogen/templates/typekit/Types.hpp
+++ b/lib/orogen/templates/typekit/Types.hpp
@@ -22,6 +22,7 @@
 #include <vector>
 #include <boost/cstdint.hpp>
 #include <boost/serialization/serialization.hpp>
+#include <boost/serialization/array.hpp>
 
 <% registered_types.each do |type| %>
 #ifdef CORELIB_DATASOURCE_HPP