"#include" read from source file, and improvements in device handling.