GCC 4.5 compatibility: fix includes.

Forgotten in the latest merge.
GCC 4.5 compatibility: fix the merge.

This was already fixed earlier but I forgot to copy it over in
9ea4f8596898f29cf63d61f71441126d007acf9e merge commit.
GCC 4.5 compatibility: some explicit typing needed.
GCC 4.5 compatibility: can't list-initialize array of classes.

As said earlier in cb7a0f6404372f866b5c0513d5aaa3b18000dda6, this is
just another case of the same issue.