fix up some ifdefs from the caf squashed patches

 *also unmark some files as executables

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>