diff --git a/src/stasis/bufferManager.c b/src/stasis/bufferManager.c
index 26014c7..2efdf54 100644
--- a/src/stasis/bufferManager.c
+++ b/src/stasis/bufferManager.c
@@ -61,7 +61,7 @@ terms specified in this license.
 #endif
 
 #include <stasis/common.h>
-#include <latches.h>
+#include "latches.h"
 #include <assert.h>
 
 #include <stasis/bufferManager.h>
@@ -74,6 +74,7 @@ terms specified in this license.
 #include <stasis/pageHandle.h>
 
 #include <stasis/lhtable.h>
+#include "page.h"
 
 #undef loadPage
 #undef releasePage
diff --git a/src/stasis/bufferManager/bufferHash.c b/src/stasis/bufferManager/bufferHash.c
index 87cba4b..d330378 100644
--- a/src/stasis/bufferManager/bufferHash.c
+++ b/src/stasis/bufferManager/bufferHash.c
@@ -1,6 +1,6 @@
 #include <pthread.h>
 #include <config.h>
-#include "bufferManager/bufferHash.h"
+#include <stasis/bufferManager/bufferHash.h>
 
 #include <stasis/bufferPool.h>
 #include <stasis/doubleLinkedList.h>
@@ -11,7 +11,7 @@
 
 #include <stasis/replacementPolicy.h>
 #include <stasis/bufferManager.h>
-
+#include <stasis/page.h>
 #include <assert.h>
 
 //#define LATCH_SANITY_CHECKING
diff --git a/src/stasis/bufferManager/pageArray.c b/src/stasis/bufferManager/pageArray.c
index 82ac03a..e86f860 100644
--- a/src/stasis/bufferManager/pageArray.c
+++ b/src/stasis/bufferManager/pageArray.c
@@ -4,8 +4,9 @@
 #include <stasis/bufferManager.h>
 #include <stasis/bufferPool.h>
 #include <stasis/truncation.h>
-#include "latches.h"
-#include "bufferManager/pageArray.h"
+#include <stasis/latches.h>
+#include <stasis/bufferManager/pageArray.h>
+#include <stasis/page.h>
 
 static Page ** pageMap;
 static int pageCount;
diff --git a/src/stasis/bufferPool.c b/src/stasis/bufferPool.c
index bd8fc3a..f45df3d 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"
 /* TODO:  Combine with buffer size... */
 static int nextPage = 0;
 static pthread_mutex_t pageMallocMutex;
diff --git a/src/stasis/consumer.c b/src/stasis/consumer.c
index 39703c8..045a6bd 100644
--- a/src/stasis/consumer.c
+++ b/src/stasis/consumer.c
@@ -1,7 +1,7 @@
 #include <stasis/consumer.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <logger/logMemory.h>
+#include <stasis/logger/logMemory.h>
 
 static lladdConsumer_def_t consumers[MAX_CONSUMER_TYPES];
 
diff --git a/src/stasis/io/non_blocking.c b/src/stasis/io/non_blocking.c
index 371e9d7..6670cac 100644
--- a/src/stasis/io/non_blocking.c
+++ b/src/stasis/io/non_blocking.c
@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <linkedlist.h>
+#include <stasis/linkedlist.h>
 /**
 
   @file
diff --git a/src/stasis/logger/logEntry.c b/src/stasis/logger/logEntry.c
index 7299602..d7a3bf3 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 "../page.h" // For stasis_record_type_to_size()
 #include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
 #include <stasis/logger/logEntry.h>
 
diff --git a/src/stasis/logger/logWriter.c b/src/stasis/logger/logWriter.c
index 0bc0f72..c537cbb 100644
--- a/src/stasis/logger/logWriter.c
+++ b/src/stasis/logger/logWriter.c
@@ -59,8 +59,8 @@ terms specified in this license.
 #include <stasis/crc32.h>
 #include "logWriter.h"
 #include "logHandle.h"
-#include "latches.h"
-#include "io.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 adbbdb2..970946c 100644
--- a/src/stasis/logger/logger2.c
+++ b/src/stasis/logger/logger2.c
@@ -57,7 +57,7 @@ terms specified in this license.
 
 #include "logWriter.h"
 #include "inMemoryLog.h"
-#include "page.h"  
+#include "../page.h"  
 
 #ifdef USE_LOGGER
 int loggerType = USE_LOGGER;
diff --git a/src/stasis/page/raw.c b/src/stasis/page/raw.c
index 9ffab89..fb87d20 100644
--- a/src/stasis/page/raw.c
+++ b/src/stasis/page/raw.c
@@ -1,4 +1,4 @@
-#include "page/raw.h"
+#include <stasis/page/raw.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
 /**
diff --git a/src/stasis/pageHandle.c b/src/stasis/pageHandle.c
index b1653d9..031fc57 100644
--- a/src/stasis/pageHandle.c
+++ b/src/stasis/pageHandle.c
@@ -6,6 +6,9 @@
 #include <stasis/bufferPool.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
+
+#include "page.h"
+
 void (*pageWrite)(Page * dat);
 void (*pageRead)(Page * ret);
 void (*forcePageFile)();
diff --git a/stasis/bufferPool.h b/stasis/bufferPool.h
index 21823e4..fa669fb 100644
--- a/stasis/bufferPool.h
+++ b/stasis/bufferPool.h
@@ -47,7 +47,7 @@ terms specified in this license.
  * $Id$
  */
 
-#include "page.h"
+#include "bufferManager.h"
 
 void bufferPoolInit();
 
diff --git a/test/stasis/check_regions.c b/test/stasis/check_regions.c
index ec3336c..cd8e96d 100644
--- a/test/stasis/check_regions.c
+++ b/test/stasis/check_regions.c
@@ -41,7 +41,7 @@ terms specified in this license.
 #include <check.h>
 #include <config.h>
 #include <stasis/common.h>
-#include <../../src/stasis/latches.h>
+#include <stasis/latches.h>
 #include <assert.h>
 
 #include <stasis/transactional.h>
diff --git a/test/stasis/check_transactional2.c b/test/stasis/check_transactional2.c
index 6e8f128..04facee 100644
--- a/test/stasis/check_transactional2.c
+++ b/test/stasis/check_transactional2.c
@@ -41,7 +41,7 @@ terms specified in this license.
 #include <check.h>
 #include <config.h>
 #include <stasis/common.h>
-#include <../../src/stasis/latches.h>
+#include <stasis/latches.h>
 #include <assert.h>
 
 #include <stasis/transactional.h>