Fix warning from including substitute.h in wrong place

Change-Id: I0a93505b15c4cf1b07dbe15927edfda81f858e1e
Reviewed-on: http://gerrit.ent.cloudera.com:8080/1898
Reviewed-by: Marcel Kornacker <marcel@cloudera.com>
Tested-by: Henry Robinson <henry@cloudera.com>
(cherry picked from commit 25bdc1e5bf8bba49a3e0e5ab4a7969e8596d78b1)
Reviewed-on: http://gerrit.ent.cloudera.com:8080/1900
Reviewed-by: Henry Robinson <henry@cloudera.com>