add s110v7 code (testing), some include changes