From 762a36353875cf662c937b0254297ab6bf2c8e01 Mon Sep 17 00:00:00 2001
From: praveenbingo <praveen@dremio.com>
Date: Tue, 12 Jun 2018 14:46:25 +0530
Subject: [PATCH] GDV-58: [CPP] Fix order of includes. (#25)

* GDV-58: [CPP] Fix order of includes.

Fixing the order of includes to follow style guideline.
The order to follow is documented here : https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
Also enabled the check in lint.
---
 cpp/src/gandiva/codegen/annotator.cc             |  4 +++-
 cpp/src/gandiva/codegen/annotator.h              |  5 +++--
 cpp/src/gandiva/codegen/annotator_test.cc        |  6 ++++--
 cpp/src/gandiva/codegen/arrow.h                  |  1 +
 cpp/src/gandiva/codegen/dex.h                    |  3 ++-
 cpp/src/gandiva/codegen/dex_llvm_test.cc         |  6 ++++--
 cpp/src/gandiva/codegen/engine.cc                | 16 +++++++++-------
 cpp/src/gandiva/codegen/engine.h                 |  7 ++++---
 cpp/src/gandiva/codegen/engine_llvm_test.cc      |  3 ++-
 cpp/src/gandiva/codegen/eval_batch.h             |  4 +++-
 cpp/src/gandiva/codegen/expr_decomposer.cc       |  5 +++--
 cpp/src/gandiva/codegen/expr_decomposer.h        |  4 ++--
 cpp/src/gandiva/codegen/expr_decomposer_test.cc  |  3 ++-
 cpp/src/gandiva/codegen/field_descriptor.h       |  1 +
 cpp/src/gandiva/codegen/func_descriptor.h        |  1 +
 cpp/src/gandiva/codegen/function_registry.cc     |  3 ++-
 cpp/src/gandiva/codegen/function_registry.h      |  1 +
 .../gandiva/codegen/function_registry_test.cc    |  3 ++-
 cpp/src/gandiva/codegen/function_signature.h     |  1 +
 .../gandiva/codegen/function_signature_test.cc   |  6 ++++--
 cpp/src/gandiva/codegen/literal_holder.h         |  1 +
 cpp/src/gandiva/codegen/llvm_generator.cc        |  6 ++++--
 cpp/src/gandiva/codegen/llvm_generator.h         |  9 +++++----
 cpp/src/gandiva/codegen/llvm_generator_test.cc   |  6 ++++--
 cpp/src/gandiva/codegen/llvm_types.h             |  3 ++-
 cpp/src/gandiva/codegen/llvm_types_test.cc       |  3 ++-
 cpp/src/gandiva/codegen/native_function.h        |  1 +
 cpp/src/gandiva/codegen/node.h                   |  7 ++++---
 cpp/src/gandiva/codegen/projector.cc             |  4 +++-
 cpp/src/gandiva/codegen/projector.h              |  1 +
 cpp/src/gandiva/codegen/status.cc                |  5 +++--
 cpp/src/gandiva/codegen/status_test.cc           |  5 +++--
 cpp/src/gandiva/codegen/tree_expr_builder.cc     |  3 ++-
 cpp/src/gandiva/codegen/tree_expr_builder.h      |  1 +
 cpp/src/gandiva/codegen/tree_expr_test.cc        |  5 +++--
 cpp/src/gandiva/codegen/value_validity_pair.h    |  1 +
 cpp/src/gandiva/precompiled/print.cc             |  1 +
 cpp/src/gandiva/precompiled/time.cc              |  1 +
 cpp/src/gandiva/precompiled/time_test.cc         |  3 ++-
 39 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/cpp/src/gandiva/codegen/annotator.cc b/cpp/src/gandiva/codegen/annotator.cc
index 777af66bdf755..387d9a0974a9d 100644
--- a/cpp/src/gandiva/codegen/annotator.cc
+++ b/cpp/src/gandiva/codegen/annotator.cc
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/annotator.h"
+
 #include <memory>
 #include <string>
-#include "codegen/annotator.h"
+
 #include "codegen/field_descriptor.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/annotator.h b/cpp/src/gandiva/codegen/annotator.h
index 7839ef4710f36..35f2b12d08f85 100644
--- a/cpp/src/gandiva/codegen/annotator.h
+++ b/cpp/src/gandiva/codegen/annotator.h
@@ -17,12 +17,13 @@
 
 #include <list>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
+
+#include "codegen/eval_batch.h"
 #include "gandiva/arrow.h"
 #include "gandiva/gandiva_aliases.h"
 #include "gandiva/logging.h"
-#include "codegen/eval_batch.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/annotator_test.cc b/cpp/src/gandiva/codegen/annotator_test.cc
index dee43508c9675..7d32a8aff70f8 100644
--- a/cpp/src/gandiva/codegen/annotator_test.cc
+++ b/cpp/src/gandiva/codegen/annotator_test.cc
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/annotator.h"
+
 #include <memory>
-#include <gtest/gtest.h>
+
 #include <arrow/memory_pool.h>
-#include "codegen/annotator.h"
+#include <gtest/gtest.h>
 #include "codegen/field_descriptor.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/arrow.h b/cpp/src/gandiva/codegen/arrow.h
index 50127afbea71d..a2877aa9798d1 100644
--- a/cpp/src/gandiva/codegen/arrow.h
+++ b/cpp/src/gandiva/codegen/arrow.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 #include <vector>
+
 #include <arrow/builder.h>
 #include <arrow/record_batch.h>
 #include <arrow/type.h>
diff --git a/cpp/src/gandiva/codegen/dex.h b/cpp/src/gandiva/codegen/dex.h
index 970bb9edf762b..4d1ebda6d2ea6 100644
--- a/cpp/src/gandiva/codegen/dex.h
+++ b/cpp/src/gandiva/codegen/dex.h
@@ -17,13 +17,14 @@
 
 #include <string>
 #include <vector>
-#include "gandiva/gandiva_aliases.h"
+
 #include "codegen/dex_visitor.h"
 #include "codegen/field_descriptor.h"
 #include "codegen/func_descriptor.h"
 #include "codegen/literal_holder.h"
 #include "codegen/native_function.h"
 #include "codegen/value_validity_pair.h"
+#include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/dex_llvm_test.cc b/cpp/src/gandiva/codegen/dex_llvm_test.cc
index a6fbcca2df6cd..74647f5cf1d99 100644
--- a/cpp/src/gandiva/codegen/dex_llvm_test.cc
+++ b/cpp/src/gandiva/codegen/dex_llvm_test.cc
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
+#include "codegen/dex.h"
+
 #include <map>
 #include <typeinfo>
-#include "codegen/dex.h"
+
+#include <gtest/gtest.h>
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/engine.cc b/cpp/src/gandiva/codegen/engine.cc
index a7c0c35837726..61fb3982dffe5 100644
--- a/cpp/src/gandiva/codegen/engine.cc
+++ b/cpp/src/gandiva/codegen/engine.cc
@@ -12,10 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/engine.h"
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <unordered_set>
+#include <utility>
+
 #include <llvm/Analysis/Passes.h>
 #include <llvm/Analysis/TargetTransformInfo.h>
 #include <llvm/Bitcode/BitcodeReader.h>
-#include "llvm/ExecutionEngine/MCJIT.h"
+#include <llvm/ExecutionEngine/MCJIT.h>
 #include <llvm/IR/DataLayout.h>
 #include <llvm/IR/LegacyPassManager.h>
 #include <llvm/IR/Verifier.h>
@@ -28,12 +36,6 @@
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/Transforms/Vectorize.h>
 #include <llvm/Transforms/Scalar/GVN.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <unordered_set>
-#include <utility>
-#include "codegen/engine.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/engine.h b/cpp/src/gandiva/codegen/engine.h
index 3a5a90d7f971c..def1908d105a4 100644
--- a/cpp/src/gandiva/codegen/engine.h
+++ b/cpp/src/gandiva/codegen/engine.h
@@ -15,13 +15,14 @@
 #ifndef GANDIVA_ENGINE_H
 #define GANDIVA_ENGINE_H
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Module.h>
-#include <memory>
-#include <string>
-#include <vector>
 #include "gandiva/logging.h"
 #include "gandiva/status.h"
 
diff --git a/cpp/src/gandiva/codegen/engine_llvm_test.cc b/cpp/src/gandiva/codegen/engine_llvm_test.cc
index 3f4dd0c46f568..4ce6379f2df30 100644
--- a/cpp/src/gandiva/codegen/engine_llvm_test.cc
+++ b/cpp/src/gandiva/codegen/engine_llvm_test.cc
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
 #include "codegen/engine.h"
+
+#include <gtest/gtest.h>
 #include "codegen/llvm_types.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/eval_batch.h b/cpp/src/gandiva/codegen/eval_batch.h
index 02bee20a81b0f..9ca7098788981 100644
--- a/cpp/src/gandiva/codegen/eval_batch.h
+++ b/cpp/src/gandiva/codegen/eval_batch.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Dremio Corporation
+    // Copyright (C) 2017-2018 Dremio Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 #ifndef GANDIVA_EXPR_EVALBATCH_H
 #define GANDIVA_EXPR_EVALBATCH_H
 
+#include <arrow/util/logging.h>
+#include "gandiva/arrow.h"
 #include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/expr_decomposer.cc b/cpp/src/gandiva/codegen/expr_decomposer.cc
index d8efad509fea8..527a0da67a2c8 100644
--- a/cpp/src/gandiva/codegen/expr_decomposer.cc
+++ b/cpp/src/gandiva/codegen/expr_decomposer.cc
@@ -18,11 +18,12 @@
 #include <stack>
 #include <string>
 #include <vector>
+
+#include "codegen/annotator.h"
 #include "codegen/dex.h"
-#include "codegen/node.h"
 #include "codegen/function_registry.h"
 #include "codegen/function_signature.h"
-#include "codegen/annotator.h"
+#include "codegen/node.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/expr_decomposer.h b/cpp/src/gandiva/codegen/expr_decomposer.h
index b1da55c06c2a6..6c21c7605ea75 100644
--- a/cpp/src/gandiva/codegen/expr_decomposer.h
+++ b/cpp/src/gandiva/codegen/expr_decomposer.h
@@ -18,11 +18,11 @@
 #include <stack>
 #include <memory>
 #include <utility>
-#include <gtest/gtest_prod.h>
 
-#include "gandiva/expression.h"
+#include <gtest/gtest_prod.h>
 #include "codegen/node_visitor.h"
 #include "codegen/node.h"
+#include "gandiva/expression.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/expr_decomposer_test.cc b/cpp/src/gandiva/codegen/expr_decomposer_test.cc
index 4a77e84f01a3a..fa8c0c57ae242 100644
--- a/cpp/src/gandiva/codegen/expr_decomposer_test.cc
+++ b/cpp/src/gandiva/codegen/expr_decomposer_test.cc
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/expr_decomposer.h"
+
 #include <gtest/gtest.h>
 #include "gandiva/gandiva_aliases.h"
 #include "gandiva/tree_expr_builder.h"
 #include "codegen/annotator.h"
 #include "codegen/dex.h"
-#include "codegen/expr_decomposer.h"
 #include "codegen/function_signature.h"
 #include "codegen/function_registry.h"
 #include "codegen/node.h"
diff --git a/cpp/src/gandiva/codegen/field_descriptor.h b/cpp/src/gandiva/codegen/field_descriptor.h
index 815315e1bf33d..e0ca8eeb0cdf8 100644
--- a/cpp/src/gandiva/codegen/field_descriptor.h
+++ b/cpp/src/gandiva/codegen/field_descriptor.h
@@ -16,6 +16,7 @@
 #define GANDIVA_FIELDDESCRIPTOR_H
 
 #include <string>
+
 #include "gandiva/arrow.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/func_descriptor.h b/cpp/src/gandiva/codegen/func_descriptor.h
index c0c2889c945af..62c80b37f830d 100644
--- a/cpp/src/gandiva/codegen/func_descriptor.h
+++ b/cpp/src/gandiva/codegen/func_descriptor.h
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <vector>
+
 #include "gandiva/arrow.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/function_registry.cc b/cpp/src/gandiva/codegen/function_registry.cc
index 35f97b66f4802..52dac2417e6d9 100644
--- a/cpp/src/gandiva/codegen/function_registry.cc
+++ b/cpp/src/gandiva/codegen/function_registry.cc
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <vector>
 #include "codegen/function_registry.h"
 
+#include <vector>
+
 namespace gandiva {
 
 using std::vector;
diff --git a/cpp/src/gandiva/codegen/function_registry.h b/cpp/src/gandiva/codegen/function_registry.h
index 6c90e0286c751..ffeb71da9bf0f 100644
--- a/cpp/src/gandiva/codegen/function_registry.h
+++ b/cpp/src/gandiva/codegen/function_registry.h
@@ -16,6 +16,7 @@
 #define GANDIVA_FUNCTION_REGISTRY_H
 
 #include <unordered_map>
+
 #include "codegen/native_function.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/function_registry_test.cc b/cpp/src/gandiva/codegen/function_registry_test.cc
index 6e0d64580cc44..33b992199a26e 100644
--- a/cpp/src/gandiva/codegen/function_registry_test.cc
+++ b/cpp/src/gandiva/codegen/function_registry_test.cc
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
 #include "codegen/function_registry.h"
 
+#include <gtest/gtest.h>
+
 namespace gandiva {
 
 class TestFunctionRegistry : public ::testing::Test {
diff --git a/cpp/src/gandiva/codegen/function_signature.h b/cpp/src/gandiva/codegen/function_signature.h
index c444b7ee646d9..143e5f336d2ed 100644
--- a/cpp/src/gandiva/codegen/function_signature.h
+++ b/cpp/src/gandiva/codegen/function_signature.h
@@ -18,6 +18,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
+
 #include "boost/functional/hash.hpp"
 #include "gandiva/arrow.h"
 #include "gandiva/logging.h"
diff --git a/cpp/src/gandiva/codegen/function_signature_test.cc b/cpp/src/gandiva/codegen/function_signature_test.cc
index 7c05475ac1b89..d2388d2bfefcf 100644
--- a/cpp/src/gandiva/codegen/function_signature_test.cc
+++ b/cpp/src/gandiva/codegen/function_signature_test.cc
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-#include <memory>
 #include "codegen/function_signature.h"
 
+#include <memory>
+
+#include <gtest/gtest.h>
+
 namespace gandiva {
 
 class TestFunctionSignature : public ::testing::Test {
diff --git a/cpp/src/gandiva/codegen/literal_holder.h b/cpp/src/gandiva/codegen/literal_holder.h
index 9935e6bffc7db..447ce48e2ec38 100644
--- a/cpp/src/gandiva/codegen/literal_holder.h
+++ b/cpp/src/gandiva/codegen/literal_holder.h
@@ -16,6 +16,7 @@
 #define GANDIVA_LITERAL_HOLDER
 
 #include <string>
+
 #include <boost/variant.hpp>
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/llvm_generator.cc b/cpp/src/gandiva/codegen/llvm_generator.cc
index 12e1d531f889c..08008ab146192 100644
--- a/cpp/src/gandiva/codegen/llvm_generator.cc
+++ b/cpp/src/gandiva/codegen/llvm_generator.cc
@@ -12,18 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/llvm_generator.h"
+
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <vector>
 #include <utility>
-#include "gandiva/expression.h"
+
 #include "codegen/bitmap_dex_visitor.h"
 #include "codegen/dex.h"
 #include "codegen/expr_decomposer.h"
 #include "codegen/function_registry.h"
-#include "codegen/llvm_generator.h"
 #include "codegen/lvalue.h"
+#include "gandiva/expression.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/llvm_generator.h b/cpp/src/gandiva/codegen/llvm_generator.h
index e8568c6f24f29..3e84308c4f348 100644
--- a/cpp/src/gandiva/codegen/llvm_generator.h
+++ b/cpp/src/gandiva/codegen/llvm_generator.h
@@ -19,16 +19,17 @@
 #include <string>
 #include <vector>
 #include <cstdint>
+
 #include <gtest/gtest_prod.h>
-#include "gandiva/gandiva_aliases.h"
-#include "codegen/dex_visitor.h"
+#include "codegen/annotator.h"
 #include "codegen/compiled_expr.h"
+#include "codegen/dex_visitor.h"
 #include "codegen/engine.h"
 #include "codegen/function_registry.h"
-#include "codegen/value_validity_pair.h"
 #include "codegen/llvm_types.h"
 #include "codegen/lvalue.h"
-#include "codegen/annotator.h"
+#include "codegen/value_validity_pair.h"
+#include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/llvm_generator_test.cc b/cpp/src/gandiva/codegen/llvm_generator_test.cc
index dd689ca63fc49..bdf819733f109 100644
--- a/cpp/src/gandiva/codegen/llvm_generator_test.cc
+++ b/cpp/src/gandiva/codegen/llvm_generator_test.cc
@@ -12,14 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/llvm_generator.h"
+
 #include <memory>
 #include <vector>
+
 #include <gtest/gtest.h>
-#include "gandiva/expression.h"
 #include "codegen/dex.h"
 #include "codegen/func_descriptor.h"
 #include "codegen/function_registry.h"
-#include "codegen/llvm_generator.h"
+#include "gandiva/expression.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/llvm_types.h b/cpp/src/gandiva/codegen/llvm_types.h
index bb21088c7cdb4..7186ef10088ae 100644
--- a/cpp/src/gandiva/codegen/llvm_types.h
+++ b/cpp/src/gandiva/codegen/llvm_types.h
@@ -15,9 +15,10 @@
 #ifndef GANDIVA_LLVM_TYPES_H
 #define GANDIVA_LLVM_TYPES_H
 
+#include <map>
+
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/IR/LLVMContext.h>
-#include <map>
 #include "gandiva/arrow.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/llvm_types_test.cc b/cpp/src/gandiva/codegen/llvm_types_test.cc
index 94a51b66e69de..381eda4bb2fa7 100644
--- a/cpp/src/gandiva/codegen/llvm_types_test.cc
+++ b/cpp/src/gandiva/codegen/llvm_types_test.cc
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "codegen/llvm_types.h"
+
 #include <gtest/gtest.h>
-#include "./llvm_types.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/native_function.h b/cpp/src/gandiva/codegen/native_function.h
index 7657b3770c1ef..bfec9af4f9654 100644
--- a/cpp/src/gandiva/codegen/native_function.h
+++ b/cpp/src/gandiva/codegen/native_function.h
@@ -18,6 +18,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+
 #include "codegen/function_signature.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/node.h b/cpp/src/gandiva/codegen/node.h
index d7d1a39a87c52..ddfbc490aac20 100644
--- a/cpp/src/gandiva/codegen/node.h
+++ b/cpp/src/gandiva/codegen/node.h
@@ -17,11 +17,12 @@
 
 #include <string>
 #include <vector>
-#include "gandiva/arrow.h"
-#include "gandiva/gandiva_aliases.h"
-#include "codegen/node_visitor.h"
+
 #include "codegen/func_descriptor.h"
 #include "codegen/literal_holder.h"
+#include "codegen/node_visitor.h"
+#include "gandiva/arrow.h"
+#include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/projector.cc b/cpp/src/gandiva/codegen/projector.cc
index 7514dbf2ec390..084c6f3c3a1d4 100644
--- a/cpp/src/gandiva/codegen/projector.cc
+++ b/cpp/src/gandiva/codegen/projector.cc
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "gandiva/projector.h"
+
 #include <memory>
 #include <vector>
 #include <utility>
-#include "gandiva/projector.h"
+
 #include "codegen/llvm_generator.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/projector.h b/cpp/src/gandiva/codegen/projector.h
index 0779b76766832..8a021507e6ab8 100644
--- a/cpp/src/gandiva/codegen/projector.h
+++ b/cpp/src/gandiva/codegen/projector.h
@@ -19,6 +19,7 @@
 #include <memory>
 #include <utility>
 #include <vector>
+
 #include "gandiva/arrow.h"
 #include "gandiva/expression.h"
 #include "gandiva/status.h"
diff --git a/cpp/src/gandiva/codegen/status.cc b/cpp/src/gandiva/codegen/status.cc
index 8c182606a25d3..2a36b9e482a03 100644
--- a/cpp/src/gandiva/codegen/status.cc
+++ b/cpp/src/gandiva/codegen/status.cc
@@ -14,10 +14,11 @@
 
 // Adapted from Apache Arrow.
 
-#include <string>
-#include <assert.h>
 #include "gandiva/status.h"
 
+#include <assert.h>
+#include <string>
+
 namespace gandiva {
 
 Status::Status(StatusCode code, const std::string& msg) {
diff --git a/cpp/src/gandiva/codegen/status_test.cc b/cpp/src/gandiva/codegen/status_test.cc
index 8b92b42fe20c0..c7c1e1cd3df31 100644
--- a/cpp/src/gandiva/codegen/status_test.cc
+++ b/cpp/src/gandiva/codegen/status_test.cc
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 // Adapted from Apache Arrow Status.
+
+#include "gandiva/status.h"
+
 #include <sstream>
 
 #include <gtest/gtest.h>
 
-#include "gandiva/status.h"
-
 namespace gandiva {
 
 TEST(StatusTest, TestCodeAndMessage) {
diff --git a/cpp/src/gandiva/codegen/tree_expr_builder.cc b/cpp/src/gandiva/codegen/tree_expr_builder.cc
index 14d48032db067..5c4eba44399a8 100644
--- a/cpp/src/gandiva/codegen/tree_expr_builder.cc
+++ b/cpp/src/gandiva/codegen/tree_expr_builder.cc
@@ -15,7 +15,8 @@
 #include "gandiva/tree_expr_builder.h"
 
 #include <utility>
-#include <codegen/node.h>
+
+#include "codegen/node.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/tree_expr_builder.h b/cpp/src/gandiva/codegen/tree_expr_builder.h
index 66e2074baeba7..b6a4aa59820fb 100644
--- a/cpp/src/gandiva/codegen/tree_expr_builder.h
+++ b/cpp/src/gandiva/codegen/tree_expr_builder.h
@@ -18,6 +18,7 @@
 
 #include <string>
 #include <vector>
+
 #include "gandiva/expression.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/codegen/tree_expr_test.cc b/cpp/src/gandiva/codegen/tree_expr_test.cc
index 1256f10584060..4ef25167017cc 100644
--- a/cpp/src/gandiva/codegen/tree_expr_test.cc
+++ b/cpp/src/gandiva/codegen/tree_expr_test.cc
@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-#include "gandiva/gandiva_aliases.h"
 #include "gandiva/tree_expr_builder.h"
+
+#include <gtest/gtest.h>
 #include "codegen/annotator.h"
 #include "codegen/dex.h"
 #include "codegen/expr_decomposer.h"
 #include "codegen/function_signature.h"
 #include "codegen/function_registry.h"
 #include "codegen/node.h"
+#include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
 
diff --git a/cpp/src/gandiva/codegen/value_validity_pair.h b/cpp/src/gandiva/codegen/value_validity_pair.h
index aa8807f8ddb13..4a14d075cffcc 100644
--- a/cpp/src/gandiva/codegen/value_validity_pair.h
+++ b/cpp/src/gandiva/codegen/value_validity_pair.h
@@ -16,6 +16,7 @@
 #define GANDIVA_VALUEVALIDITYPAIR_H
 
 #include <vector>
+
 #include "gandiva/gandiva_aliases.h"
 
 namespace gandiva {
diff --git a/cpp/src/gandiva/precompiled/print.cc b/cpp/src/gandiva/precompiled/print.cc
index bf7a5835c1a71..cf12ba5dae1d9 100644
--- a/cpp/src/gandiva/precompiled/print.cc
+++ b/cpp/src/gandiva/precompiled/print.cc
@@ -15,6 +15,7 @@
 extern "C" {
 
 #include <stdio.h>
+
 #include "./types.h"
 
 int print_double(char *msg, double val) {
diff --git a/cpp/src/gandiva/precompiled/time.cc b/cpp/src/gandiva/precompiled/time.cc
index d6dc15d59181c..dafc8e3738dd9 100644
--- a/cpp/src/gandiva/precompiled/time.cc
+++ b/cpp/src/gandiva/precompiled/time.cc
@@ -16,6 +16,7 @@ extern "C" {
 
 #include<time.h>
 #include<stdlib.h>
+
 #include "./types.h"
 
 #define MILLIS_TO_SEC(millis) (millis / 1000)
diff --git a/cpp/src/gandiva/precompiled/time_test.cc b/cpp/src/gandiva/precompiled/time_test.cc
index 0fce9d2657a57..267c230d31237 100644
--- a/cpp/src/gandiva/precompiled/time_test.cc
+++ b/cpp/src/gandiva/precompiled/time_test.cc
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
 #include <time.h>
+
+#include <gtest/gtest.h>
 #include "precompiled/types.h"
 
 namespace gandiva {