Removed unneeded header style filename #defines
more powerstroke build infrastructure
Merge from fe-moved