diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index c56b4a022d8..a5acc1d467a 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -219,6 +219,7 @@ jobs:
       ARROW_DATASET: ON
       ARROW_FLIGHT: ON
       ARROW_FLIGHT_SQL: ON
+      ARROW_FLIGHT_SQL_ODBC: ON
       ARROW_GANDIVA: ON
       ARROW_GCS: ON
       ARROW_HDFS: OFF
@@ -331,6 +332,7 @@ jobs:
       ARROW_DEPENDENCY_USE_SHARED: OFF
       ARROW_FLIGHT: ON
       ARROW_FLIGHT_SQL: ON
+      ARROW_FLIGHT_SQL_ODBC: ON
       ARROW_GANDIVA: OFF
       ARROW_GLIB_VAPI: "false"
       ARROW_HDFS: OFF
diff --git a/cpp/src/arrow/flight/sql/odbc/CMakeLists.txt b/cpp/src/arrow/flight/sql/odbc/CMakeLists.txt
index d641873514b..975559c2626 100644
--- a/cpp/src/arrow/flight/sql/odbc/CMakeLists.txt
+++ b/cpp/src/arrow/flight/sql/odbc/CMakeLists.txt
@@ -61,7 +61,8 @@ set(ODBC_PACKAGE_VERSION_PATCH "0")
 set(ODBC_PACKAGE_NAME "Apache Arrow Flight SQL ODBC")
 set(ODBC_PACKAGE_VENDOR "Apache Arrow")
 
-set(ARROW_FLIGHT_SQL_ODBC_SRCS entry_points.cc odbc_api.cc)
+# Compile entry_points.cc before odbc_api.cc due to conflict from sql.h and flight/types.h
+set(ARROW_FLIGHT_SQL_ODBC_SRCS odbc_api.cc entry_points.cc)
 
 if(WIN32)
   set(VER_FILEVERSION
diff --git a/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.h b/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.h
index 5970bdf1243..fd4f634e157 100644
--- a/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.h
+++ b/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_columns.h
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#pragma once
+
 #include <optional>
 #include "arrow/array/builder_binary.h"
 #include "arrow/array/builder_primitive.h"
diff --git a/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_type_info.h b/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_type_info.h
index 556341fc000..aeb2cfb4264 100644
--- a/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_type_info.h
+++ b/cpp/src/arrow/flight/sql/odbc/flight_sql/flight_sql_statement_get_type_info.h
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#pragma once
+
 #include <optional>
 #include "arrow/array/builder_binary.h"
 #include "arrow/array/builder_primitive.h"
diff --git a/cpp/src/arrow/flight/sql/odbc/flight_sql/utils.h b/cpp/src/arrow/flight/sql/odbc/flight_sql/utils.h
index 8b3e14599a7..43ff213c445 100644
--- a/cpp/src/arrow/flight/sql/odbc/flight_sql/utils.h
+++ b/cpp/src/arrow/flight/sql/odbc/flight_sql/utils.h
@@ -17,7 +17,9 @@
 
 #pragma once
 
+#include <boost/variant.hpp>
 #include <boost/xpressive/xpressive.hpp>
+
 #include <codecvt>
 #include <functional>
 #include <optional>