cleanup commented-out
add Camera.h per bug rept from Marius Kintel