diff --git a/benchmarks/transitiveClosure.c b/benchmarks/transitiveClosure.c
index 5bde2ef..2eaf6b1 100644
--- a/benchmarks/transitiveClosure.c
+++ b/benchmarks/transitiveClosure.c
@@ -1,7 +1,7 @@
 #include <stasis/transactional.h>
 #include <stasis/multiplexer.h>
 #include <stasis/graph.h>
-#include "../src/stasis/logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/benchmarks/zeroCopy.c b/benchmarks/zeroCopy.c
index 4288c03..5d09024 100644
--- a/benchmarks/zeroCopy.c
+++ b/benchmarks/zeroCopy.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stasis/transactional.h>
 #include <unistd.h>
-#include "../src/stasis/page/raw.h"
+#include <stasis/page/raw.h>
 #include <string.h>
 
 int main(int argc, char** argv) { 
diff --git a/src/stasis/blobManager.c b/src/stasis/blobManager.c
index eb1cc6a..2585035 100644
--- a/src/stasis/blobManager.c
+++ b/src/stasis/blobManager.c
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <stasis/transactional.h>
-#include "page/raw.h"
+#include <stasis/page/raw.h>
 #include <assert.h>
 
 
diff --git a/src/stasis/bufferManager.c b/src/stasis/bufferManager.c
index 2efdf54..cd6cdd6 100644
--- a/src/stasis/bufferManager.c
+++ b/src/stasis/bufferManager.c
@@ -61,12 +61,12 @@ terms specified in this license.
 #endif
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <assert.h>
 
 #include <stasis/bufferManager.h>
-#include "bufferManager/pageArray.h"
-#include "bufferManager/bufferHash.h"
+#include <stasis/bufferManager/pageArray.h>
+#include <stasis/bufferManager/bufferHash.h>
 #include <stasis/bufferPool.h>
 
 #include <stasis/lockManager.h>
@@ -74,7 +74,7 @@ terms specified in this license.
 #include <stasis/pageHandle.h>
 
 #include <stasis/lhtable.h>
-#include "page.h"
+#include <stasis/page.h>
 
 #undef loadPage
 #undef releasePage
diff --git a/src/stasis/bufferPool.c b/src/stasis/bufferPool.c
index f45df3d..d11f8e9 100644
--- a/src/stasis/bufferPool.c
+++ b/src/stasis/bufferPool.c
@@ -54,7 +54,7 @@ terms specified in this license.
 #include <stasis/bufferPool.h>
 #include <assert.h>
 #include <stasis/truncation.h>
-#include "page.h"
+#include <stasis/page.h>
 /* TODO:  Combine with buffer size... */
 static int nextPage = 0;
 static pthread_mutex_t pageMallocMutex;
diff --git a/src/stasis/common.c b/src/stasis/common.c
index fa3ee11..a7014c6 100644
--- a/src/stasis/common.c
+++ b/src/stasis/common.c
@@ -3,7 +3,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "latches.h"
+#include <stasis/latches.h>
 
 #include <pbl/pbl.h>
 #include <errno.h>
diff --git a/src/stasis/fifo.c b/src/stasis/fifo.c
index 04ee126..1449eeb 100644
--- a/src/stasis/fifo.c
+++ b/src/stasis/fifo.c
@@ -2,7 +2,7 @@
 #include <stasis/crc32.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 #include <string.h>
 #include <assert.h>
diff --git a/src/stasis/graph.c b/src/stasis/graph.c
index cfd5e3b..baa8846 100644
--- a/src/stasis/graph.c
+++ b/src/stasis/graph.c
@@ -2,7 +2,7 @@
 #include <alloca.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/crc32.h>
 
 int numOut = 0;
diff --git a/src/stasis/io.c b/src/stasis/io.c
index 9e40278..b6687ea 100644
--- a/src/stasis/io.c
+++ b/src/stasis/io.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "io.h"
+#include <stasis/io.h>
 #include <stdlib.h>
 /** @file 
 
diff --git a/src/stasis/iterator.c b/src/stasis/iterator.c
index d304f01..57bfa64 100644
--- a/src/stasis/iterator.c
+++ b/src/stasis/iterator.c
@@ -4,7 +4,7 @@
 
 #include <stasis/operations.h>
 #include <stasis/arrayCollection.h>
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 static lladdIterator_def_t iterators[MAX_ITERATOR_TYPES];
 
diff --git a/src/stasis/lhtable.c b/src/stasis/lhtable.c
index 4e892b5..969436b 100644
--- a/src/stasis/lhtable.c
+++ b/src/stasis/lhtable.c
@@ -5,7 +5,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include "latches.h"
+#include <stasis/latches.h>
 
 #define FILL_FACTOR (0.5)
 
diff --git a/src/stasis/linkedlist.c b/src/stasis/linkedlist.c
index 1b414b7..e07eef2 100644
--- a/src/stasis/linkedlist.c
+++ b/src/stasis/linkedlist.c
@@ -47,7 +47,7 @@ terms specified in this license.
 #include <config.h>
 #include <stasis/common.h>
 
-#include "linkedlist.h"
+#include <stasis/linkedlist.h>
 
 #include <stdio.h>
 
diff --git a/src/stasis/lockManager.c b/src/stasis/lockManager.c
index 3399f19..a01046a 100644
--- a/src/stasis/lockManager.c
+++ b/src/stasis/lockManager.c
@@ -3,7 +3,7 @@
 #include <stasis/compensations.h>
 #include <sys/time.h>
 #include <time.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/stasis/logger/inMemoryLog.c b/src/stasis/logger/inMemoryLog.c
index 05bca33..584b559 100644
--- a/src/stasis/logger/inMemoryLog.c
+++ b/src/stasis/logger/inMemoryLog.c
@@ -1,5 +1,5 @@
-#include "inMemoryLog.h"
-#include "../latches.h"
+#include <stasis/logger/inMemoryLog.h>
+#include <stasis/latches.h>
 #include <string.h>
 #include <assert.h>
 static rwl * flushedLSN_lock;
diff --git a/src/stasis/logger/logEntry.c b/src/stasis/logger/logEntry.c
index d295824..4eb50f0 100644
--- a/src/stasis/logger/logEntry.c
+++ b/src/stasis/logger/logEntry.c
@@ -45,7 +45,7 @@ terms specified in this license.
 
 #include <assert.h>
 
-#include "../page.h" // For stasis_record_type_to_size()
+#include <stasis/page.h> // For stasis_record_type_to_size()
 #include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
 #include <stasis/logger/logEntry.h>
 #include <stasis/crc32.h>
diff --git a/src/stasis/logger/logHandle.c b/src/stasis/logger/logHandle.c
index 3843d09..4f319aa 100644
--- a/src/stasis/logger/logHandle.c
+++ b/src/stasis/logger/logHandle.c
@@ -44,7 +44,7 @@ terms specified in this license.
 
 #include <stdlib.h>
 
-#include "logHandle.h"
+#include <stasis/logger/logHandle.h>
 
 /**
    Sets the next and prev field of h, but does not set h.file_offset.
diff --git a/src/stasis/logger/logMemory.c b/src/stasis/logger/logMemory.c
index f80dc22..f74b08c 100644
--- a/src/stasis/logger/logMemory.c
+++ b/src/stasis/logger/logMemory.c
@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
-#include "logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <errno.h>
 #include <stasis/compensations.h>
 
diff --git a/src/stasis/logger/logWriter.c b/src/stasis/logger/logWriter.c
index c537cbb..21a43ff 100644
--- a/src/stasis/logger/logWriter.c
+++ b/src/stasis/logger/logWriter.c
@@ -57,8 +57,8 @@ terms specified in this license.
 #include <stasis/common.h>
 
 #include <stasis/crc32.h>
-#include "logWriter.h"
-#include "logHandle.h"
+#include <stasis/logger/logWriter.h>
+#include <stasis/logger/logHandle.h>
 #include <stasis/latches.h>
 #include <stasis/io.h>
 #include <assert.h>
diff --git a/src/stasis/logger/logger2.c b/src/stasis/logger/logger2.c
index 970946c..5b278d0 100644
--- a/src/stasis/logger/logger2.c
+++ b/src/stasis/logger/logger2.c
@@ -55,9 +55,9 @@ terms specified in this license.
 
 #include <stasis/logger/logger2.h>
 
-#include "logWriter.h"
-#include "inMemoryLog.h"
-#include "../page.h"  
+#include <stasis/logger/logWriter.h>
+#include <stasis/logger/inMemoryLog.h>
+#include <stasis/page.h>
 
 #ifdef USE_LOGGER
 int loggerType = USE_LOGGER;
diff --git a/src/stasis/multiplexer.c b/src/stasis/multiplexer.c
index 17dc5ef..e538dca 100644
--- a/src/stasis/multiplexer.c
+++ b/src/stasis/multiplexer.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stasis/operations/linearHashNTA.h>
 
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 lladdMultiplexer_t * lladdMultiplexer_alloc(int xid, lladdIterator_t * it, 
 					    void (*multiplexer)(byte * key,
diff --git a/src/stasis/operations.c b/src/stasis/operations.c
index 3fd6f10..990a08e 100644
--- a/src/stasis/operations.c
+++ b/src/stasis/operations.c
@@ -50,7 +50,7 @@ terms specified in this license.
 #include <stasis/logger/logger2.h>
 #include <stasis/bufferManager.h>
 
-#include "page.h"
+#include <stasis/page.h>
 
 
 Operation operationsTable[MAX_OPERATIONS];
diff --git a/src/stasis/operations/alloc.c b/src/stasis/operations/alloc.c
index 3798633..5201282 100644
--- a/src/stasis/operations/alloc.c
+++ b/src/stasis/operations/alloc.c
@@ -6,8 +6,8 @@
 #include <stasis/transactional.h>
 #include <stasis/bufferManager.h>
 #include <stasis/allocationPolicy.h>
-#include "../blobManager.h"
-#include "../page.h"
+#include <stasis/blobManager.h>
+#include <stasis/page.h>
 #include <assert.h>
 //try{
 /**
diff --git a/src/stasis/operations/arrayList.c b/src/stasis/operations/arrayList.c
index 905d42a..8e6ce3d 100644
--- a/src/stasis/operations/arrayList.c
+++ b/src/stasis/operations/arrayList.c
@@ -2,7 +2,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations/pageOperations.h>
 #include <stasis/operations/arrayList.h>
 #include <stasis/transactional.h>
diff --git a/src/stasis/operations/bTree.c b/src/stasis/operations/bTree.c
index 174440a..25abe4f 100644
--- a/src/stasis/operations/bTree.c
+++ b/src/stasis/operations/bTree.c
@@ -1,6 +1,6 @@
 #define __USE_GNU
 #define _GNU_SOURCE
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <stdlib.h>
@@ -9,7 +9,7 @@
 #include <stasis/operations/noop.h>
 #include <stasis/fifo.h>
 #include <stasis/multiplexer.h>
-#include "../logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <stdio.h>
 
 int HelloWorld(){
diff --git a/src/stasis/operations/decrement.c b/src/stasis/operations/decrement.c
index 8ea32d1..aa771c8 100644
--- a/src/stasis/operations/decrement.c
+++ b/src/stasis/operations/decrement.c
@@ -46,7 +46,7 @@ terms specified in this license.
  *********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;
diff --git a/src/stasis/operations/increment.c b/src/stasis/operations/increment.c
index 55de26b..549c298 100644
--- a/src/stasis/operations/increment.c
+++ b/src/stasis/operations/increment.c
@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;
diff --git a/src/stasis/operations/instantSet.c b/src/stasis/operations/instantSet.c
index 0f32a1c..f911be5 100644
--- a/src/stasis/operations/instantSet.c
+++ b/src/stasis/operations/instantSet.c
@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {
   stasis_record_write(xid, p, lsn, rid, dat); 
diff --git a/src/stasis/operations/linearHash.c b/src/stasis/operations/linearHash.c
index 50a290c..9ed282c 100644
--- a/src/stasis/operations/linearHash.c
+++ b/src/stasis/operations/linearHash.c
@@ -4,7 +4,7 @@
 #include <limits.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 /**
 
diff --git a/src/stasis/operations/linearHashNTA.c b/src/stasis/operations/linearHashNTA.c
index 7e787d7..31cc042 100644
--- a/src/stasis/operations/linearHashNTA.c
+++ b/src/stasis/operations/linearHashNTA.c
@@ -1,6 +1,6 @@
 #define __USE_GNU
 #define _GNU_SOURCE
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <assert.h>
@@ -8,7 +8,7 @@
 // The next two #includes are for deprecated code.
 #include <stasis/fifo.h>
 #include <stasis/multiplexer.h>
-#include "../logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 /**
    re-entrant implementation of a linear hash hable, using nested top actions.
 
diff --git a/src/stasis/operations/linkedListNTA.c b/src/stasis/operations/linkedListNTA.c
index fb4eb1b..eafdc4a 100644
--- a/src/stasis/operations/linkedListNTA.c
+++ b/src/stasis/operations/linkedListNTA.c
@@ -1,7 +1,7 @@
 #define __USE_GNU 
 #define _GNU_SOURCE
-#include "../latches.h"
 
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <stdlib.h>
diff --git a/src/stasis/operations/lsmTree.c b/src/stasis/operations/lsmTree.c
index 9534525..c243452 100644
--- a/src/stasis/operations/lsmTree.c
+++ b/src/stasis/operations/lsmTree.c
@@ -5,7 +5,7 @@
 #include <stasis/constants.h>
 //  XXX including fixed.h breaks page api encapsulation; we need a "last slot"
 // call.
-#include "../page/fixed.h"
+#include <stasis/page/fixed.h>
 #include <pthread.h>
 
 static lsm_comparator_t comparators[MAX_LSM_COMPARATORS];
diff --git a/src/stasis/operations/naiveLinearHash.c b/src/stasis/operations/naiveLinearHash.c
index dc33bd7..62c4d67 100644
--- a/src/stasis/operations/naiveLinearHash.c
+++ b/src/stasis/operations/naiveLinearHash.c
@@ -2,7 +2,7 @@
 #include <stasis/hash.h>
 #include <limits.h>
 #include <assert.h>
-#include "../latches.h"
+#include <stasis/latches.h>
 /**
 
    A from-scratch implementation of linear hashing.  Uses the
diff --git a/src/stasis/operations/nestedTopActions.c b/src/stasis/operations/nestedTopActions.c
index 269c8e7..19943ef 100644
--- a/src/stasis/operations/nestedTopActions.c
+++ b/src/stasis/operations/nestedTopActions.c
@@ -51,7 +51,7 @@ terms specified in this license.
 #include <pbl/pbl.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <assert.h>
 /** @todo Remove extern declaration of transactional_2_mutex from nestedTopActions.c */
 extern pthread_mutex_t transactional_2_mutex;
diff --git a/src/stasis/operations/noop.c b/src/stasis/operations/noop.c
index bd546fa..a55803e 100644
--- a/src/stasis/operations/noop.c
+++ b/src/stasis/operations/noop.c
@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 int noop(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {
   /* If p is null, then this is a logical no-op that spans pages, so do nothing.
diff --git a/src/stasis/operations/pageOperations.c b/src/stasis/operations/pageOperations.c
index e9bcf07..ac263ec 100644
--- a/src/stasis/operations/pageOperations.c
+++ b/src/stasis/operations/pageOperations.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "config.h"
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations/pageOperations.h>
 #include <assert.h>
 #include <alloca.h>
diff --git a/src/stasis/operations/regions.c b/src/stasis/operations/regions.c
index dcdf37c..0389db4 100644
--- a/src/stasis/operations/regions.c
+++ b/src/stasis/operations/regions.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations.h>
 #include <assert.h>
 
diff --git a/src/stasis/operations/set.c b/src/stasis/operations/set.c
index 9637b86..28c852f 100644
--- a/src/stasis/operations/set.c
+++ b/src/stasis/operations/set.c
@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 #include <string.h>
 #include <assert.h>
 static int operate(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {
diff --git a/src/stasis/page.c b/src/stasis/page.c
index bfdac27..cfc0377 100644
--- a/src/stasis/page.c
+++ b/src/stasis/page.c
@@ -74,20 +74,20 @@ terms specified in this license.
 
 #include <config.h>
 #include <stasis/common.h>
-#include "latches.h"
-#include "page.h"
+#include <stasis/latches.h>
+#include <stasis/page.h>
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <stasis/constants.h>
 #include <assert.h>
-#include "blobManager.h"
+#include <stasis/blobManager.h>
 #include <stasis/lockManager.h>
 #include <stasis/compensations.h>
-#include "page/slotted.h"
-#include "page/fixed.h"
-#include "page/indirect.h"
+#include <stasis/page/slotted.h>
+#include <stasis/page/fixed.h>
+#include <stasis/page/indirect.h>
 #include <stasis/operations/arrayList.h>
 #include <stasis/bufferPool.h>
 #include <stasis/truncation.h>
diff --git a/src/stasis/page/fixed.c b/src/stasis/page/fixed.c
index 02ead3b..cac2e0c 100644
--- a/src/stasis/page/fixed.c
+++ b/src/stasis/page/fixed.c
@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "../page.h"
-#include "fixed.h"
+#include <stasis/page.h>
+#include <stasis/page/fixed.h>
 /** @todo should page implementations provide readLSN / writeLSN??? */
 #include <stasis/truncation.h>
 
diff --git a/src/stasis/page/indirect.c b/src/stasis/page/indirect.c
index 0e05d3b..ef7e903 100644
--- a/src/stasis/page/indirect.c
+++ b/src/stasis/page/indirect.c
@@ -1,10 +1,10 @@
-#include "indirect.h"
-#include "slotted.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
+#include <stasis/page/slotted.h>
 #include <math.h>
 #include <string.h>
 #include <assert.h>
-#include "../blobManager.h"
-#include "../page.h"
+#include <stasis/blobManager.h>
 
 #include <stasis/operations.h>
 
diff --git a/src/stasis/page/slotted.c b/src/stasis/page/slotted.c
index c3133b0..1667679 100644
--- a/src/stasis/page/slotted.c
+++ b/src/stasis/page/slotted.c
@@ -1,8 +1,8 @@
 /** $Id$ */
 
 #include "config.h"
-#include "../page.h"
-#include "slotted.h"
+#include <stasis/page.h>
+#include <stasis/page/slotted.h>
 #include <assert.h>
 /** @todo should page implementations provide readLSN / writeLSN??? */
 #include <stasis/truncation.h>
diff --git a/src/stasis/pageCache.c b/src/stasis/pageCache.c
index e5370ea..7f186da 100644
--- a/src/stasis/pageCache.c
+++ b/src/stasis/pageCache.c
@@ -8,7 +8,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/pageCache.h>
 #include <stasis/bufferManager.h>
 
diff --git a/src/stasis/pageFile.c b/src/stasis/pageFile.c
index eab975a..963afe9 100644
--- a/src/stasis/pageFile.c
+++ b/src/stasis/pageFile.c
@@ -4,10 +4,10 @@
 
 */
 #include "config.h"
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 
-#include "pageFile.h"
+#include <stasis/pageFile.h>
 #include <stasis/pageHandle.h>
 #include <assert.h>
 #include <stasis/logger/logger2.h>
diff --git a/src/stasis/pageHandle.c b/src/stasis/pageHandle.c
index 031fc57..34d9a23 100644
--- a/src/stasis/pageHandle.c
+++ b/src/stasis/pageHandle.c
@@ -7,7 +7,7 @@
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
 
-#include "page.h"
+#include <stasis/page.h>
 
 void (*pageWrite)(Page * dat);
 void (*pageRead)(Page * ret);
diff --git a/src/stasis/recovery2.c b/src/stasis/recovery2.c
index 48b8295..7df7da0 100644
--- a/src/stasis/recovery2.c
+++ b/src/stasis/recovery2.c
@@ -19,10 +19,10 @@
 /** @todo Add better log iterator guard support and remove this include.*/
 #include <stasis/operations/prepare.h>
 
-#include "logger/logHandle.h"
+#include <stasis/logger/logHandle.h>
 /** @todo Get rid of linkedlist.[ch] */
-#include "linkedlist.h"
-#include "page.h" // Needed for pageReadLSN. 
+#include <stasis/linkedlist.h>
+#include <stasis/page.h> // Needed for pageReadLSN. 
 
 
 static pblHashTable_t * transactionLSN;
diff --git a/src/stasis/stats.c b/src/stasis/stats.c
index f22dd69..c3cf3fc 100644
--- a/src/stasis/stats.c
+++ b/src/stasis/stats.c
@@ -1,6 +1,6 @@
 #include <config.h>
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 
 #include <math.h>
 
diff --git a/src/stasis/transactional2.c b/src/stasis/transactional2.c
index 7c04695..1103a97 100644
--- a/src/stasis/transactional2.c
+++ b/src/stasis/transactional2.c
@@ -4,16 +4,16 @@
 #include <fcntl.h>
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/recovery.h>
 #include <stasis/bufferManager.h>
 #include <stasis/consumer.h>
 #include <stasis/lockManager.h>
 #include <stasis/compensations.h>
-#include "pageFile.h"
+#include <stasis/pageFile.h>
 #include <stasis/pageHandle.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
 #include <stasis/io/handle.h>
diff --git a/src/stasis/truncation.c b/src/stasis/truncation.c
index cfd6192..95026fb 100644
--- a/src/stasis/truncation.c
+++ b/src/stasis/truncation.c
@@ -2,7 +2,7 @@
 #include <stasis/truncation.h>
 #include <pbl/pbl.h>
 #include <stasis/logger/logger2.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <assert.h>
 
 static int initialized = 0;
diff --git a/src/stasis/blobManager.h b/stasis/blobManager.h
similarity index 98%
rename from src/stasis/blobManager.h
rename to stasis/blobManager.h
index e62e855..2921bc5 100644
--- a/src/stasis/blobManager.h
+++ b/stasis/blobManager.h
@@ -2,7 +2,7 @@
 #define __BLOB_MANAGER_H
 
 #include <stasis/common.h>
-#include "page.h"
+#include <stasis/page.h>
 BEGIN_C_DECLS
 
 /**    
diff --git a/src/stasis/bufferManager/bufferHash.h b/stasis/bufferManager/bufferHash.h
similarity index 100%
rename from src/stasis/bufferManager/bufferHash.h
rename to stasis/bufferManager/bufferHash.h
diff --git a/src/stasis/bufferManager/pageArray.h b/stasis/bufferManager/pageArray.h
similarity index 100%
rename from src/stasis/bufferManager/pageArray.h
rename to stasis/bufferManager/pageArray.h
diff --git a/src/stasis/io.h b/stasis/io.h
similarity index 100%
rename from src/stasis/io.h
rename to stasis/io.h
diff --git a/src/stasis/latches.h b/stasis/latches.h
similarity index 100%
rename from src/stasis/latches.h
rename to stasis/latches.h
diff --git a/src/stasis/linkedlist.h b/stasis/linkedlist.h
similarity index 100%
rename from src/stasis/linkedlist.h
rename to stasis/linkedlist.h
diff --git a/src/stasis/logger/inMemoryLog.h b/stasis/logger/inMemoryLog.h
similarity index 100%
rename from src/stasis/logger/inMemoryLog.h
rename to stasis/logger/inMemoryLog.h
diff --git a/src/stasis/logger/logHandle.h b/stasis/logger/logHandle.h
similarity index 100%
rename from src/stasis/logger/logHandle.h
rename to stasis/logger/logHandle.h
diff --git a/src/stasis/logger/logMemory.h b/stasis/logger/logMemory.h
similarity index 100%
rename from src/stasis/logger/logMemory.h
rename to stasis/logger/logMemory.h
diff --git a/src/stasis/logger/logWriter.h b/stasis/logger/logWriter.h
similarity index 100%
rename from src/stasis/logger/logWriter.h
rename to stasis/logger/logWriter.h
diff --git a/src/stasis/operations/lsmIterators.h b/stasis/operations/lsmIterators.h
similarity index 100%
rename from src/stasis/operations/lsmIterators.h
rename to stasis/operations/lsmIterators.h
diff --git a/src/stasis/operations/lsmTable.h b/stasis/operations/lsmTable.h
similarity index 100%
rename from src/stasis/operations/lsmTable.h
rename to stasis/operations/lsmTable.h
diff --git a/src/stasis/operations/lsmWorkers.h b/stasis/operations/lsmWorkers.h
similarity index 100%
rename from src/stasis/operations/lsmWorkers.h
rename to stasis/operations/lsmWorkers.h
diff --git a/src/stasis/pageFile.h b/stasis/operations/pageFile.h
similarity index 100%
rename from src/stasis/pageFile.h
rename to stasis/operations/pageFile.h
diff --git a/src/stasis/page.h b/stasis/page.h
similarity index 99%
rename from src/stasis/page.h
rename to stasis/page.h
index b6efd9e..693943f 100644
--- a/src/stasis/page.h
+++ b/stasis/page.h
@@ -102,7 +102,7 @@ terms specified in this license.
 #define __PAGE_H__
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 
 BEGIN_C_DECLS
diff --git a/src/stasis/page/compression/compression.h b/stasis/page/compression/compression.h
similarity index 100%
rename from src/stasis/page/compression/compression.h
rename to stasis/page/compression/compression.h
diff --git a/src/stasis/page/compression/for-impl.h b/stasis/page/compression/for-impl.h
similarity index 100%
rename from src/stasis/page/compression/for-impl.h
rename to stasis/page/compression/for-impl.h
diff --git a/src/stasis/page/compression/for.h b/stasis/page/compression/for.h
similarity index 100%
rename from src/stasis/page/compression/for.h
rename to stasis/page/compression/for.h
diff --git a/src/stasis/page/compression/multicolumn-impl.h b/stasis/page/compression/multicolumn-impl.h
similarity index 100%
rename from src/stasis/page/compression/multicolumn-impl.h
rename to stasis/page/compression/multicolumn-impl.h
diff --git a/src/stasis/page/compression/multicolumn.h b/stasis/page/compression/multicolumn.h
similarity index 100%
rename from src/stasis/page/compression/multicolumn.h
rename to stasis/page/compression/multicolumn.h
diff --git a/src/stasis/page/compression/nop.h b/stasis/page/compression/nop.h
similarity index 100%
rename from src/stasis/page/compression/nop.h
rename to stasis/page/compression/nop.h
diff --git a/src/stasis/page/compression/pageLayout.h b/stasis/page/compression/pageLayout.h
similarity index 100%
rename from src/stasis/page/compression/pageLayout.h
rename to stasis/page/compression/pageLayout.h
diff --git a/src/stasis/page/compression/pluginDispatcher.h b/stasis/page/compression/pluginDispatcher.h
similarity index 100%
rename from src/stasis/page/compression/pluginDispatcher.h
rename to stasis/page/compression/pluginDispatcher.h
diff --git a/src/stasis/page/compression/pstar-impl.h b/stasis/page/compression/pstar-impl.h
similarity index 100%
rename from src/stasis/page/compression/pstar-impl.h
rename to stasis/page/compression/pstar-impl.h
diff --git a/src/stasis/page/compression/pstar.h b/stasis/page/compression/pstar.h
similarity index 100%
rename from src/stasis/page/compression/pstar.h
rename to stasis/page/compression/pstar.h
diff --git a/src/stasis/page/compression/rle-impl.h b/stasis/page/compression/rle-impl.h
similarity index 100%
rename from src/stasis/page/compression/rle-impl.h
rename to stasis/page/compression/rle-impl.h
diff --git a/src/stasis/page/compression/rle.h b/stasis/page/compression/rle.h
similarity index 100%
rename from src/stasis/page/compression/rle.h
rename to stasis/page/compression/rle.h
diff --git a/src/stasis/page/compression/staticMulticolumn.h b/stasis/page/compression/staticMulticolumn.h
similarity index 100%
rename from src/stasis/page/compression/staticMulticolumn.h
rename to stasis/page/compression/staticMulticolumn.h
diff --git a/src/stasis/page/compression/staticTuple.h b/stasis/page/compression/staticTuple.h
similarity index 100%
rename from src/stasis/page/compression/staticTuple.h
rename to stasis/page/compression/staticTuple.h
diff --git a/src/stasis/page/compression/tuple.h b/stasis/page/compression/tuple.h
similarity index 100%
rename from src/stasis/page/compression/tuple.h
rename to stasis/page/compression/tuple.h
diff --git a/src/stasis/page/fixed.h b/stasis/page/fixed.h
similarity index 100%
rename from src/stasis/page/fixed.h
rename to stasis/page/fixed.h
diff --git a/src/stasis/page/header.h b/stasis/page/header.h
similarity index 100%
rename from src/stasis/page/header.h
rename to stasis/page/header.h
diff --git a/src/stasis/page/indirect.h b/stasis/page/indirect.h
similarity index 100%
rename from src/stasis/page/indirect.h
rename to stasis/page/indirect.h
diff --git a/src/stasis/page/raw.h b/stasis/page/raw.h
similarity index 99%
rename from src/stasis/page/raw.h
rename to stasis/page/raw.h
index ed9cf88..d933585 100644
--- a/src/stasis/page/raw.h
+++ b/stasis/page/raw.h
@@ -75,7 +75,7 @@ terms specified in this license.
   */
 
 #include <stasis/common.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 #define units_from_start_raw(unit,page,count) (((unit*)(page->memAddr))+(count))
 
diff --git a/src/stasis/page/slotted.h b/stasis/page/slotted.h
similarity index 100%
rename from src/stasis/page/slotted.h
rename to stasis/page/slotted.h
diff --git a/stasis/pageFile.h b/stasis/pageFile.h
new file mode 100644
index 0000000..079b16d
--- /dev/null
+++ b/stasis/pageFile.h
@@ -0,0 +1,7 @@
+
+#ifndef __PAGE_FILE_H
+#define __PAGE_FILE_H
+
+void openPageFile();
+
+#endif /* __PAGE_FILE_H */
diff --git a/test/stasis/check_bTree.c b/test/stasis/check_bTree.c
index b8c91cf..07ec1da 100644
--- a/test/stasis/check_bTree.c
+++ b/test/stasis/check_bTree.c
@@ -47,7 +47,7 @@ terms specified in this license.
 #include <stasis/transactional.h>
 
 
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/test/stasis/check_blobRecovery.c b/test/stasis/check_blobRecovery.c
index efff6e6..7353700 100644
--- a/test/stasis/check_blobRecovery.c
+++ b/test/stasis/check_blobRecovery.c
@@ -46,7 +46,6 @@ terms specified in this license.
 
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
-#include "../../src/stasis/logger/logWriter.h"
 #include "../check_includes.h"
 #include <assert.h>
 
diff --git a/test/stasis/check_bufferManager.c b/test/stasis/check_bufferManager.c
index ad7f50a..75808e4 100644
--- a/test/stasis/check_bufferManager.c
+++ b/test/stasis/check_bufferManager.c
@@ -1,8 +1,8 @@
 #include <config.h>
 #include <check.h>
 #include <stasis/transactional.h>
-#include "../../src/stasis/latches.h"
-#include "../../src/stasis/page.h"
+#include <stasis/latches.h>
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 #include <sched.h>
 #include <assert.h>
diff --git a/test/stasis/check_indirect.c b/test/stasis/check_indirect.c
index 682d504..85992f7 100644
--- a/test/stasis/check_indirect.c
+++ b/test/stasis/check_indirect.c
@@ -46,8 +46,8 @@ terms specified in this license.
 
 #include "../check_includes.h"
 #include <stasis/bufferManager.h>
-#include "src/stasis/page.h"
-#include "../../src/stasis/page/indirect.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
 
 #include <assert.h>
 
diff --git a/test/stasis/check_logWriter.c b/test/stasis/check_logWriter.c
index 53aa94c..86df041 100644
--- a/test/stasis/check_logWriter.c
+++ b/test/stasis/check_logWriter.c
@@ -51,11 +51,11 @@ terms specified in this license.
 #include <check.h>
 
 #include <stasis/transactional.h>
-#include "../../src/stasis/logger/logHandle.h"
+#include <stasis/logger/logHandle.h>
 #include <stasis/logger/logger2.h>
-#include "../../src/stasis/logger/logWriter.h"
+#include <stasis/logger/logWriter.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"
diff --git a/test/stasis/check_multiplexer.c b/test/stasis/check_multiplexer.c
index 6c0ec0f..553b49c 100644
--- a/test/stasis/check_multiplexer.c
+++ b/test/stasis/check_multiplexer.c
@@ -51,7 +51,7 @@ terms specified in this license.
 #include "../check_includes.h"
 
 #include <stasis/multiplexer.h>
-#include "../../src/stasis/logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 #include <sys/time.h>
 #include <time.h>
diff --git a/test/stasis/check_operations.c b/test/stasis/check_operations.c
index f82e900..4397a81 100644
--- a/test/stasis/check_operations.c
+++ b/test/stasis/check_operations.c
@@ -47,7 +47,7 @@ terms specified in this license.
 #include <stasis/bufferManager.h>
 #include <stasis/truncation.h>
 #include "../check_includes.h"
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 #define LOG_NAME   "check_operations.log"
 
 #include <stdio.h>
diff --git a/test/stasis/check_page.c b/test/stasis/check_page.c
index 24096fd..19775e3 100644
--- a/test/stasis/check_page.c
+++ b/test/stasis/check_page.c
@@ -49,14 +49,14 @@ terms specified in this license.
 #include <config.h>
 #include <check.h>
 
-#include "../../src/stasis/page.h"
-#include "../../src/stasis/page/indirect.h"
-#include "../../src/stasis/page/slotted.h"
-#include "../../src/stasis/blobManager.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
+#include <stasis/page/slotted.h>
+#include <stasis/blobManager.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"
diff --git a/test/stasis/check_pageOperations.c b/test/stasis/check_pageOperations.c
index 4f6c78a..fc2dea6 100644
--- a/test/stasis/check_pageOperations.c
+++ b/test/stasis/check_pageOperations.c
@@ -44,19 +44,18 @@ terms specified in this license.
 #include <config.h>
 #include <check.h>
 
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>
 #include <stasis/truncation.h>
 #include <stasis/logger/logger2.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"
 
 #define LOG_NAME   "check_pageOperations.log"
-#include "../../src/stasis/logger/logWriter.h"
 extern int numActiveXactions;
 
 START_TEST(pageOpCheckRecovery) {
diff --git a/test/stasis/check_recovery.c b/test/stasis/check_recovery.c
index 0a2b446..5f65bcb 100644
--- a/test/stasis/check_recovery.c
+++ b/test/stasis/check_recovery.c
@@ -46,7 +46,6 @@ terms specified in this license.
 #include <stasis/transactional.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
-#include "../../src/stasis/logger/logWriter.h"
 #include "../check_includes.h"
 
 #define LOG_NAME   "check_recovery.log"
diff --git a/utilities/logfile_dump.c b/utilities/logfile_dump.c
index 3a3b4da..92bb9c5 100644
--- a/utilities/logfile_dump.c
+++ b/utilities/logfile_dump.c
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../src/stasis/logger/logHandle.h"
-#include "../src/stasis/logger/logWriter.h"
+#include <stasis/logger/logHandle.h>
+#include <stasis/logger/logWriter.h>
 
 
 static char * logEntryToString(const LogEntry * le) {