more #include for code highlight and fix more bugs.