Move some more files to /include

Change-Id: I774d696f86ee2eda6635174776bdb13f7b0f87bd
Merge "Move some more files to /include"