fixed warps <-> wefts, changed includes to minimized versions