[patch] Remove deprecated headers

This patch removes deprecated header files related to the change of the
folder structure.

Usage: patch -p1 < path/to/Patch
(cherry picked from commit 00892d56)