The surplus copies of "os_common.h" and "hwtime.h" are harmless. Nevertheless, the duplication should now be fixed on trunk