diff --git a/.clang-format b/.clang-format
index 46145c57bac..4deb873dff2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -139,7 +139,10 @@ InsertTrailingCommas: Wrapped
 IndentRequires: true
 IndentPPDirectives: AfterHash
 IndentWidth: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLines:
+  AtEndOfFile: true
+  AtStartOfBlock: false
+  AtStartOfFile: false
 MaxEmptyLinesToKeep: 1
 Macros:
 - _CCCL_TEMPLATE(...)=template<...>
diff --git a/c/parallel/test/test_segmented_reduce.cpp b/c/parallel/test/test_segmented_reduce.cpp
index d0a8b005714..b2b376e6623 100644
--- a/c/parallel/test/test_segmented_reduce.cpp
+++ b/c/parallel/test/test_segmented_reduce.cpp
@@ -1,4 +1,3 @@
-
 #include <cstdint>
 #include <cstdlib>
 #include <numeric>
diff --git a/c/parallel/test/test_transform.cpp b/c/parallel/test/test_transform.cpp
index 2379e432189..5816a355b44 100644
--- a/c/parallel/test/test_transform.cpp
+++ b/c/parallel/test/test_transform.cpp
@@ -1,4 +1,3 @@
-
 #include <cstdint>
 #include <cstdlib>
 #include <iostream> // std::cerr
diff --git a/cub/cub/device/dispatch/dispatch_streaming_reduce_by_key.cuh b/cub/cub/device/dispatch/dispatch_streaming_reduce_by_key.cuh
index 8b38890ce1c..b5316269167 100644
--- a/cub/cub/device/dispatch/dispatch_streaming_reduce_by_key.cuh
+++ b/cub/cub/device/dispatch/dispatch_streaming_reduce_by_key.cuh
@@ -1,4 +1,3 @@
-
 // SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
diff --git a/cub/cub/device/dispatch/dispatch_unique_by_key.cuh b/cub/cub/device/dispatch/dispatch_unique_by_key.cuh
index a3c6cebd22f..e25ae729dd7 100644
--- a/cub/cub/device/dispatch/dispatch_unique_by_key.cuh
+++ b/cub/cub/device/dispatch/dispatch_unique_by_key.cuh
@@ -1,4 +1,3 @@
-
 // SPDX-FileCopyrightText: Copyright (c), NVIDIA CORPORATION. All rights reserved.
 // SPDX-License-Identifier: BSD-3
 
diff --git a/libcudacxx/codegen/generators/header.h b/libcudacxx/codegen/generators/header.h
index 7bc0984ee25..d64335628fe 100644
--- a/libcudacxx/codegen/generators/header.h
+++ b/libcudacxx/codegen/generators/header.h
@@ -15,8 +15,7 @@
 
 inline void FormatHeader(std::ostream& out)
 {
-  std::string header = R"XXX(
-//===----------------------------------------------------------------------===//
+  std::string header = R"XXX(//===----------------------------------------------------------------------===//
 //
 // Part of libcu++, the C++ Standard Library for your entire system,
 // under the Apache License v2.0 with LLVM Exceptions.
diff --git a/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h b/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h
index b07a03f2877..c81f040ab85 100644
--- a/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h
+++ b/libcudacxx/include/cuda/std/__atomic/functions/cuda_ptx_generated.h
@@ -1,4 +1,3 @@
-
 //===----------------------------------------------------------------------===//
 //
 // Part of libcu++, the C++ Standard Library for your entire system,
diff --git a/libcudacxx/include/cuda/std/__cccl/deprecated.h b/libcudacxx/include/cuda/std/__cccl/deprecated.h
index 2fd27bf13df..a8e470954ff 100644
--- a/libcudacxx/include/cuda/std/__cccl/deprecated.h
+++ b/libcudacxx/include/cuda/std/__cccl/deprecated.h
@@ -1,4 +1,3 @@
-
 //===----------------------------------------------------------------------===//
 //
 // Part of libcu++, the C++ Standard Library for your entire system,
diff --git a/libcudacxx/test/libcudacxx/std/random/seed_seq/generate.pass.cpp b/libcudacxx/test/libcudacxx/std/random/seed_seq/generate.pass.cpp
index 7249eea3a06..06d9c252fba 100644
--- a/libcudacxx/test/libcudacxx/std/random/seed_seq/generate.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/random/seed_seq/generate.pass.cpp
@@ -1,4 +1,3 @@
-
 //===----------------------------------------------------------------------===//
 //
 // Part of libcu++, the C++ Standard Library for your entire system,
diff --git a/thrust/testing/offset_iterator.cu b/thrust/testing/offset_iterator.cu
index bd994e70c28..2e40ac974fe 100644
--- a/thrust/testing/offset_iterator.cu
+++ b/thrust/testing/offset_iterator.cu
@@ -1,4 +1,3 @@
-
 #include <thrust/distance.h>
 #include <thrust/iterator/offset_iterator.h>
 
diff --git a/thrust/thrust/detail/pointer.h b/thrust/thrust/detail/pointer.h
index f3e049121de..5fd862d7845 100644
--- a/thrust/thrust/detail/pointer.h
+++ b/thrust/thrust/detail/pointer.h
@@ -1,4 +1,3 @@
-
 /*
  *  Copyright 2008-2021 NVIDIA Corporation
  *
diff --git a/thrust/thrust/system/detail/generic/select_system.h b/thrust/thrust/system/detail/generic/select_system.h
index 972c77e4072..56c478954b4 100644
--- a/thrust/thrust/system/detail/generic/select_system.h
+++ b/thrust/thrust/system/detail/generic/select_system.h
@@ -1,4 +1,3 @@
-
 /*
  *  Copyright 2008-2013 NVIDIA Corporation
  *
diff --git a/thrust/thrust/zip_function.h b/thrust/thrust/zip_function.h
index c3f1ba0742e..645e44365d3 100644
--- a/thrust/thrust/zip_function.h
+++ b/thrust/thrust/zip_function.h
@@ -1,4 +1,3 @@
-
 /*! \file thrust/zip_function.h
  *  \brief Adaptor type that turns an N-ary function object into one that takes
  *         a tuple of size N so it can easily be used with algorithms taking zip