diff --git a/datapage.cpp b/datapage.cpp
index 91ca013..0434dba 100644
--- a/datapage.cpp
+++ b/datapage.cpp
@@ -86,7 +86,7 @@ void DataPage<TUPLE>::initialize(int xid)
 }
 
 template <class TUPLE>
-inline bool DataPage<TUPLE>::append(int xid, TUPLE const & dat)
+bool DataPage<TUPLE>::append(int xid, TUPLE const & dat)
 {
     assert(byte_offset >= HEADER_SIZE);
     assert(fix_pcount >= 1);
diff --git a/datapage.h b/datapage.h
index adbc1e5..9c2a109 100644
--- a/datapage.h
+++ b/datapage.h
@@ -59,7 +59,7 @@ public:
 
     ~DataPage();
 
-    inline bool append(int xid, TUPLE const & dat);
+    bool append(int xid, TUPLE const & dat);
     bool recordRead(int xid, typename TUPLE::key_t key, size_t keySize,  TUPLE ** buf);
 
     inline uint16_t recordCount(int xid);
diff --git a/logiterators.cpp b/logiterators.cpp
index 80a079b..7e0eec7 100644
--- a/logiterators.cpp
+++ b/logiterators.cpp
@@ -1,11 +1,6 @@
-
 #include "logstore.h"
-//#include "datapage.cpp"
 #include "logiterators.h"
 
-
- 
-
 //template <class MEMTREE, class TUPLE>
 /*
 template <>
diff --git a/logstore.cpp b/logstore.cpp
index 1a04d49..d32712f 100644
--- a/logstore.cpp
+++ b/logstore.cpp
@@ -1,20 +1,13 @@
-
-
-
 #include <string.h>
 #include <assert.h>
 #include <math.h>
 #include <ctype.h>
 
-
 #include "merger.h"
 #include "logstore.h"
 #include "logiterators.h"
-
-
 #include "datapage.cpp"
 
-
 #include <stasis/page/slotted.h>
 
 /////////////////////////////////////////////////////////////////
diff --git a/merger.cpp b/merger.cpp
index a89dffa..b24603c 100644
--- a/merger.cpp
+++ b/merger.cpp
@@ -2,7 +2,7 @@
 #include <math.h>
 #include "merger.h"
 #include "logiterators.cpp"
-#include "datapage.cpp"
+#include "datapage.h"
 //pageid_t merge_scheduler::C0_MEM_SIZE = 1000 * 1000 * 1000;
 
 //template <> struct merger_args<rbtree_t>;
diff --git a/server.cpp b/server.cpp
index 60af0cf..4f847b0 100644
--- a/server.cpp
+++ b/server.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_datapage.cpp b/test/check_datapage.cpp
index afcf280..70a7fc1 100644
--- a/test/check_datapage.cpp
+++ b/test/check_datapage.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <sstream>
 #include <logstore.h>
-#include <datapage.cpp> // XXX
+#include <datapage.h>
 
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_logtable.cpp b/test/check_logtable.cpp
index 0a54cae..a24a210 100644
--- a/test/check_logtable.cpp
+++ b/test/check_logtable.cpp
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
diff --git a/test/check_merge.cpp b/test/check_merge.cpp
index b74caec..65746e7 100644
--- a/test/check_merge.cpp
+++ b/test/check_merge.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_mergelarge.cpp b/test/check_mergelarge.cpp
index 5f363bd..626cce5 100644
--- a/test/check_mergelarge.cpp
+++ b/test/check_mergelarge.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_mergetuple.cpp b/test/check_mergetuple.cpp
index 8d26172..02beb6a 100644
--- a/test/check_mergetuple.cpp
+++ b/test/check_mergetuple.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_rbtree.cpp b/test/check_rbtree.cpp
index d62cf82..96a74a1 100644
--- a/test/check_rbtree.cpp
+++ b/test/check_rbtree.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <sstream>
 #include "logstore.h"
-#include "datapage.cpp"
-#include "logiterators.cpp"
+#include "datapage.h"
+#include "logiterators.h"
 #include "merger.h"
 #include <assert.h>
 #include <limits.h>