More files that got magically nuked in the last merge

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>