diff --git a/cpp/frontend_flag_spec.cc b/cpp/frontend_flag_spec.cc
index 9f3a0a340d..e1e8c3552a 100644
--- a/cpp/frontend_flag_spec.cc
+++ b/cpp/frontend_flag_spec.cc
@@ -2,38 +2,7 @@
 
 #include "frontend_flag_spec.h"
 #include "arg_types.h"
-
-// "header" copied from _build/cpp/osh_eval.cc.  TODO: mycpp should be able to
-// export headers!
-namespace args {
-args::_Attributes* Parse(runtime_asdl::FlagSpec_* spec, args::Reader* arg_r);
-args::_Attributes* ParseLikeEcho(runtime_asdl::FlagSpec_* spec,
-                                 args::Reader* arg_r);
-args::_Attributes* ParseMore(flag_spec::_FlagSpecAndMore* spec,
-                             args::Reader* arg_r);
-
-// Copied from osh_eval.cc translation
-class Reader {
- public:
-  Reader(List<Str*>* argv, List<int>* spids);
-  void Next();
-  Str* Peek();
-  Tuple2<Str*, int> Peek2();
-  Str* ReadRequired(Str* error_msg);
-  Tuple2<Str*, int> ReadRequired2(Str* error_msg);
-  List<Str*>* Rest();
-  Tuple2<List<Str*>*, List<int>*> Rest2();
-  bool AtEnd();
-  int _FirstSpanId();
-  int SpanId();
-
-  List<Str*>* argv;
-  int i;
-  int n;
-  List<int>* spids;
-};
-
-}  // namespace args
+#include "osh_eval.h"  // args::Reader, etc.
 
 namespace flag_spec {
 
diff --git a/cpp/postamble.cc b/cpp/postamble.cc
index 0eaed9c036..b1604a6622 100644
--- a/cpp/postamble.cc
+++ b/cpp/postamble.cc
@@ -4,10 +4,8 @@
 
 namespace optview {
 
-#ifndef OSH_PARSE  // hack for osh_parse, set in build/mycpp.sh
 bool Exec::errexit() {
   return errexit_->value();
 }
-#endif  // OSH_PARSE
 
 }  // namespace optview
diff --git a/types/more-oil-manifest.txt b/types/more-oil-manifest.txt
index b17ad98367..8c8df0e97c 100644
--- a/types/more-oil-manifest.txt
+++ b/types/more-oil-manifest.txt
@@ -5,3 +5,4 @@
 ./core/process.py
 ./core/executor.py
 ./core/shell.py
+./osh/builtin_process.py
diff --git a/types/oil-slice.sh b/types/oil-slice.sh
index 9cbe4634c0..2eda3dc71c 100755
--- a/types/oil-slice.sh
+++ b/types/oil-slice.sh
@@ -42,7 +42,6 @@ osh-eval() {
   PYTHONPATH=. bin/osh_eval.py "$@"
 }
 
-readonly OSH_PARSE_DEPS='_tmp/osh_parse-deps.txt'
 readonly OSH_EVAL_DEPS='_tmp/osh_eval-deps.txt'
 
 deps() {
@@ -110,8 +109,6 @@ travis-setup() {
   # TODO: add stat.py back.  Why does it cause errors?
   local exclude='vendor|__future__|mylib.py|/stat.py'
 
-  osh-parse-deps
-  egrep -v "$exclude" $OSH_PARSE_DEPS | tee $OSH_PARSE_MANIFEST
   osh-eval-deps
   egrep -v "$exclude" $OSH_EVAL_DEPS | tee $OSH_EVAL_MANIFEST
 }
@@ -126,7 +123,6 @@ travis() {
     return
   fi
 
-  #typecheck-all $OSH_PARSE_MANIFEST
   typecheck-all $OSH_EVAL_MANIFEST
 }
 
diff --git a/types/osh-eval-manifest.txt b/types/osh-eval-manifest.txt
index 48f943ff10..87742a1493 100644
--- a/types/osh-eval-manifest.txt
+++ b/types/osh-eval-manifest.txt
@@ -51,7 +51,6 @@
 ./osh/builtin_meta.py
 ./osh/builtin_misc.py
 ./osh/builtin_printf.py
-./osh/builtin_process.py
 ./osh/builtin_pure.py
 ./osh/cmd_eval.py
 ./osh/cmd_parse.py