diff -r emmst2-0.9/buckets/buckets.h emmst2/buckets/buckets.h
16c16
< #include "../stxxl/containers/stack.h"
---
> #include <stxxl/stack>
diff -r emmst2-0.9/data_structures/edge.h emmst2/data_structures/edge.h
136c136
<     key_type operator() (const EdgeType & obj)
---
>     key_type operator() (const EdgeType & obj) const
diff -r emmst2-0.9/data_structures/edgeVector.cpp emmst2/data_structures/edgeVector.cpp
14,15c14,15
< //#include "../stxxl/algo/sort.h"
< #include "../stxxl/algo/ksort.h"
---
> #include <stxxl/sort>
> #include <stxxl/ksort>
diff -r emmst2-0.9/data_structures/edgeVector.h emmst2/data_structures/edgeVector.h
19c19
< #include "../stxxl/containers/vector.h"
---
> #include <stxxl.h>
diff -r emmst2-0.9/Makefile emmst2/Makefile
3c3
< STXXL_PATH = stxxl
---
> STXXL_PATH = /opt/stxxl-1.1.0
7c7
< 	${COMPILER} -o mst ${DEBUG} ${WARNING} ${OPTIMIZER} ${LARGE_FILE} ${STXXL_SPECIFIC} ${FILES} -L${STXXL_PATH}/lib -lstxxl -lpthread
---
> 	${COMPILER} -I${STXXL_PATH}/include -o mst ${DEBUG} ${WARNING} ${OPTIMIZER} ${LARGE_FILE} ${STXXL_SPECIFIC} ${FILES} -L${STXXL_PATH}/lib -lstxxl -lpthread
diff -r emmst2-0.9/priority_queue/pQueue.h emmst2/priority_queue/pQueue.h
15c15
< #include "../stxxl/containers/priority_queue.h"
---
> #include <stxxl/priority_queue>
diff -r emmst2-0.9/utils/geometricGraphGenerator.h emmst2/utils/geometricGraphGenerator.h
18,19c18,19
< #include "../stxxl/containers/vector.h"
< #include "../stxxl/algo/sort.h"
---
> #include <stxxl/vector>
> #include <stxxl/sort>
diff -r emmst2-0.9/utils/importExport.cpp emmst2/utils/importExport.cpp
12c12
< #include "../stxxl/algo/sort.h"
---
> #include <stxxl/sort>
diff -r emmst2-0.9/utils/logging.h emmst2/utils/logging.h
14c14,15
< #include "../stxxl/common/utils.h"
---
> #include <stxxl.h>
> 
diff -r emmst2-0.9/utils/utils.h emmst2/utils/utils.h
6c6
< #include "../stxxl/utils/malloc.h"
---
> #include <stxxl/mallocstats>