By restoring includes which are still needed, conditionally.

Change-Id: Icc331c7d6a084af7d93b941ea879f0c60b9ca9f3