Merge remote-tracking branch 'origin/sdf12' into ahcorde/usd_to_sdf_transforms

Author: ahcorde

usd/src/cmd/usd2sdf.cc

@@ -15,12 +15,11 @@
  *
  */
 
-#include <string.h>
+#include <string>
 
 #include <ignition/utils/cli/CLI.hpp>
-
 #include "sdf/usd/usd_parser/ParseUSD.hh"
-#include "sdf/sdf.hh"
+#include "sdf/config.hh"
 
 //////////////////////////////////////////////////
 /// \brief Enumeration of available commands