fix #include directives

fix #include directives of the form

#include "string.h"
#include "vector"

into

#include &lt;cstring&gt;
#include &lt;vector&gt;