Fixing compile issues after rebase of PR 363.

Author: marek-trtik

src/goto-programs/builtin_functions.cpp

@@ -584,7 +584,7 @@ void goto_convertt::do_java_new(
   malloc_expr.copy_to_operands(object_size);
   // could use true and get rid of the code below
   malloc_expr.copy_to_operands(false_exprt());
-  malloc_expr.type()=pointer_typet(object_type);
+  malloc_expr.type()=rhs.type();
 
   goto_programt::targett t_n=dest.add_instruction(ASSIGN);
   t_n->code=code_assignt(lhs, malloc_expr);
@@ -624,7 +624,7 @@ void goto_convertt::do_java_new_array(
   malloc_expr.copy_to_operands(object_size);
   // code use true and get rid of the code below
   malloc_expr.copy_to_operands(false_exprt());
-  malloc_expr.type()=pointer_typet(object_type);
+  malloc_expr.type()=rhs.type();
 
   goto_programt::targett t_n=dest.add_instruction(ASSIGN);
   t_n->code=code_assignt(lhs, malloc_expr);

src/goto-programs/system_library_symbols.h

@@ -14,6 +14,7 @@ Author: Thomas Kiley
 
 #include <list>
 #include <set>
+#include <map>
 #include <string>
 #include <util/irep.h>
 #include <util/type.h>

src/memory-models/mm2cpp.cpp

@@ -9,6 +9,7 @@ Author: Daniel Kroening, [email protected]
 #include "mm2cpp.h"
 
 #include <ostream>
+#include <map>
 
 #include <util/std_code.h>