Better -Werror,-Wunused-function workaround, missing files

Change-Id: I8bcdbf3c2b9dec25eab943212258bc2b3a82ebc7