Minor cleanup bw_ header files