Merged from last google-code commit

Also moved include files