changed makefile and include to work on my machine. My machine is all messed up: it has llvm3.1 and 3.2 simultaneously