Fix imports for (ijputils syntax)
Add a bunch of common macros to (ijputils common)