diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 612a67b87..14c25af05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,8 +32,7 @@ set(HERMES_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/api/hermes.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/api/vbucket.cc
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer_pool.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/data_placement_engine.cc
-        api/traits.cc)
+  ${CMAKE_CURRENT_SOURCE_DIR}/data_placement_engine.cc)
 
 #------------------------------------------------------------------------------
 # Libraries
diff --git a/src/api/traits.h b/src/api/traits.h
index 438b2bf26..37dc89ec9 100644
--- a/src/api/traits.h
+++ b/src/api/traits.h
@@ -7,16 +7,16 @@
 
 namespace hermes {
 namespace api {
+
 struct BlobInfo {
   std::string bucket_name;
   std::string blob_name;
 };
-typedef BlobInfo TraitInput;
-// typedef void* TraitCallback;
 
+typedef BlobInfo TraitInput;
 struct Trait;
 typedef std::function<void(TraitInput &, Trait *)> TraitCallback;
-// typedef void(*TraitCallback)(TraitInput &, Trait *);
+
 struct Trait {
   TraitID id;
   TraitIdArray conflict_traits;
diff --git a/src/buffer_pool.cc b/src/buffer_pool.cc
index 7d5de88fb..682cb6564 100644
--- a/src/buffer_pool.cc
+++ b/src/buffer_pool.cc
@@ -28,6 +28,7 @@
 #include "memory_management.cc"
 #include "config_parser.cc"
 #include "utils.cc"
+#include "traits.cc"
 
 #if defined(HERMES_COMMUNICATION_MPI)
 #include "communication_mpi.cc"