diff --git a/devtools/CMakeLists.txt b/devtools/CMakeLists.txt
index 58043067a5..aaee4d1d0b 100644
--- a/devtools/CMakeLists.txt
+++ b/devtools/CMakeLists.txt
@@ -176,6 +176,8 @@ add_custom_command(
 add_library(
   etdump ${CMAKE_CURRENT_SOURCE_DIR}/etdump/etdump_flatcc.cpp
          ${CMAKE_CURRENT_SOURCE_DIR}/etdump/emitter.cpp
+         ${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.cpp
+         ${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.h
 )
 
 target_link_libraries(
diff --git a/devtools/etdump/data_sinks/buffer_data_sink.cpp b/devtools/etdump/data_sinks/buffer_data_sink.cpp
index 597245dbc1..d635c775fd 100644
--- a/devtools/etdump/data_sinks/buffer_data_sink.cpp
+++ b/devtools/etdump/data_sinks/buffer_data_sink.cpp
@@ -20,7 +20,7 @@ Result<size_t> BufferDataSink::write(const void* ptr, size_t length) {
     return static_cast<size_t>(-1);
   }
   uint8_t* offset_ptr =
-      internal::alignPointer(debug_buffer_.data() + offset_, 64);
+      internal::align_pointer(debug_buffer_.data() + offset_, 64);
 
   // Zero out the padding between data blobs.
   size_t n_zero_pad = offset_ptr - debug_buffer_.data() - offset_;
diff --git a/devtools/etdump/data_sinks/data_sink_base.h b/devtools/etdump/data_sinks/data_sink_base.h
index 1ddc7bd144..cb7b6cb7fc 100644
--- a/devtools/etdump/data_sinks/data_sink_base.h
+++ b/devtools/etdump/data_sinks/data_sink_base.h
@@ -17,7 +17,7 @@ namespace etdump {
 /**
  * DataSinkBase is an abstract class that users can inherit and implement
  * to customize the storage and management of debug data in ETDumpGen. This
- * class provides an basic and essential interface for writing datablob to a
+ * class provides a basic and essential interface for writing datablob to a
  * user-defined storage, retrieving storage capacity, and tracking the amount of
  * data stored.
  */
diff --git a/devtools/etdump/etdump_flatcc.cpp b/devtools/etdump/etdump_flatcc.cpp
index 33998bd678..0298193328 100644
--- a/devtools/etdump/etdump_flatcc.cpp
+++ b/devtools/etdump/etdump_flatcc.cpp
@@ -107,8 +107,8 @@ ETDumpGen::ETDumpGen(Span<uint8_t> buffer) {
 
   if (buffer.data() != nullptr) {
     builder_ =
-        (struct flatcc_builder*)internal::alignPointer(buffer.data(), 64);
-    uintptr_t buffer_with_builder = (uintptr_t)internal::alignPointer(
+        (struct flatcc_builder*)internal::align_pointer(buffer.data(), 64);
+    uintptr_t buffer_with_builder = (uintptr_t)internal::align_pointer(
         builder_ + sizeof(struct flatcc_builder), 64);
     size_t builder_size =
         (size_t)(buffer_with_builder - (uintptr_t)buffer.data());
@@ -630,7 +630,7 @@ size_t ETDumpGen::get_debug_buffer_size() const {
 }
 
 size_t ETDumpGen::get_data_sink_size() const {
-  ET_CHECK_MSG(data_sink_, "Must set data sink before checking its size\n");
+  ET_CHECK_MSG(data_sink_, "Must set data sink before checking its size");
   Result<size_t> ret = data_sink_->get_storage_size();
   ET_CHECK_MSG(
       ret.ok(),
@@ -640,7 +640,7 @@ size_t ETDumpGen::get_data_sink_size() const {
 }
 
 long ETDumpGen::write_tensor_or_raise_error(Tensor tensor) {
-  ET_CHECK_MSG(data_sink_, "Must set data sink before writing data\n");
+  ET_CHECK_MSG(data_sink_, "Must set data sink before writing data");
   Result<size_t> ret =
       data_sink_->write(tensor.const_data_ptr(), tensor.nbytes());
   ET_CHECK_MSG(
diff --git a/devtools/etdump/utils.h b/devtools/etdump/utils.h
index 8bb0e70acc..227fcdbc53 100644
--- a/devtools/etdump/utils.h
+++ b/devtools/etdump/utils.h
@@ -9,7 +9,7 @@ namespace executorch {
 namespace etdump {
 namespace internal {
 
-inline uint8_t* alignPointer(void* ptr, size_t alignment) {
+inline uint8_t* align_pointer(void* ptr, size_t alignment) {
   intptr_t addr = reinterpret_cast<intptr_t>(ptr);
   if ((addr & (alignment - 1)) == 0) {
     // Already aligned.
diff --git a/runtime/core/error.h b/runtime/core/error.h
index 2cae76ae98..73e343a5c4 100644
--- a/runtime/core/error.h
+++ b/runtime/core/error.h
@@ -85,7 +85,6 @@ enum class Error : error_code_t {
   /// Does not have enough resources to perform the requested operation.
   OutOfResources = 0x25,
 
-
   /*
    * Delegate errors.
    */