search for: 990784

Hi, several of the patches I submitted last week have not yet been applied, and most of it was really uncontroversial stuff like adding some #includes and some typecasts, fixing alloca for visual C etc. I guess I just wrote too many mails so it was lost in the process, so here is a diff which includes all changes I have made, except those related to hash_map differences since my solution