Fixed include directives and namespaces to match new versions of Spirit and Phoenix (using backward compatibility headers)