diff --git a/src/trace_processor/table.h b/src/trace_processor/table.h
index 6e3f8d4..db1af75 100644
--- a/src/trace_processor/table.h
+++ b/src/trace_processor/table.h
@@ -120,7 +120,7 @@
     Schema(std::vector<Column>, std::vector<size_t> primary_keys);
 
     // This class is explicitly copiable.
-    Schema(const Schema&) noexcept;
+    Schema(const Schema&);
     Schema& operator=(const Schema& t);
 
     std::string ToCreateTableStmt();
diff --git a/src/trace_processor/trace_processor_shell.cc b/src/trace_processor/trace_processor_shell.cc
index 05540e1..c86a82a 100644
--- a/src/trace_processor/trace_processor_shell.cc
+++ b/src/trace_processor/trace_processor_shell.cc
@@ -46,8 +46,8 @@
 #include <signal.h>
 #endif
 
-using namespace perfetto;
-using namespace perfetto::trace_processor;
+namespace perfetto {
+namespace trace_processor {
 
 namespace {
 TraceProcessor* g_tp;
@@ -182,9 +182,7 @@
   printf("\nQuery executed in %.3f ms\n\n", (t_end - t_start).count() / 1E6);
 }
 
-}  // namespace
-
-int main(int argc, char** argv) {
+int TraceProcessorMain(int argc, char** argv) {
   if (argc < 2) {
     PERFETTO_ELOG("Usage: %s [-d] trace_file.proto", argv[0]);
     return 1;
@@ -275,3 +273,12 @@
 
   return 0;
 }
+
+}  // namespace
+
+}  // namespace trace_processor
+}  // namespace perfetto
+
+int main(int argc, char** argv) {
+  return perfetto::trace_processor::TraceProcessorMain(argc, argv);
+}