added #define and #include
more updates