From 539b0c662ee9eaa40e56d24bddc3a23ef6e1759b Mon Sep 17 00:00:00 2001
From: Akarshan Biswas <akarshan.biswas@gmail.com>
Date: Mon, 3 Feb 2025 10:01:07 +0530
Subject: [PATCH] ggml-sycl: sort includes

---
 ggml/include/ggml-sycl.h         | 3 ---
 ggml/src/ggml-sycl/common.hpp    | 7 ++++++-
 ggml/src/ggml-sycl/ggml-sycl.cpp | 8 +-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ggml/include/ggml-sycl.h b/ggml/include/ggml-sycl.h
index 5ce349a88..6b0bebf9c 100644
--- a/ggml/include/ggml-sycl.h
+++ b/ggml/include/ggml-sycl.h
@@ -9,9 +9,6 @@
 #include "ggml.h"
 #include "ggml-backend.h"
 
-#define GGML_SYCL_NAME "SYCL"
-#define GGML_SYCL_MAX_DEVICES 48
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/ggml/src/ggml-sycl/common.hpp b/ggml/src/ggml-sycl/common.hpp
index 38f5cda72..0eb291ecc 100644
--- a/ggml/src/ggml-sycl/common.hpp
+++ b/ggml/src/ggml-sycl/common.hpp
@@ -17,7 +17,6 @@
 #include <iostream>
 
 #include "dpct/helper.hpp"
-#include "ggml-sycl.h"
 #include "presets.hpp"
 #if GGML_SYCL_DNNL
 #include "dnnl.hpp"
@@ -31,6 +30,9 @@
 #pragma clang diagnostic ignored "-Wnested-anon-types"
 #include "ggml-common.h"
 #pragma clang diagnostic pop
+#include <sycl/half_type.hpp>
+#include <sycl/sycl.hpp>
+
 #include "ggml-backend-impl.h"
 #include "ggml-impl.h"
 #include "ggml.h"
@@ -88,6 +90,9 @@ extern int g_ggml_sycl_debug;
 #define GGML_SYCL_MMV_Y 1
 #endif
 
+#define GGML_SYCL_NAME "SYCL"
+#define GGML_SYCL_MAX_DEVICES 48
+
 typedef sycl::queue *queue_ptr;
 
 enum ggml_sycl_backend_gpu_mode {
diff --git a/ggml/src/ggml-sycl/ggml-sycl.cpp b/ggml/src/ggml-sycl/ggml-sycl.cpp
index 6303444aa..b0d081862 100644
--- a/ggml/src/ggml-sycl/ggml-sycl.cpp
+++ b/ggml/src/ggml-sycl/ggml-sycl.cpp
@@ -29,15 +29,9 @@
 #include <stdlib.h>
 #include <regex>
 
-#include <sycl/sycl.hpp>
-#include <sycl/half_type.hpp>
-
 #include "ggml-sycl.h"
-#include "ggml-impl.h"
-#include "ggml-backend-impl.h"
-
+#include "common.hpp"
 #include "ggml-sycl/backend.hpp"
-#include "ggml-sycl/presets.hpp"
 #include "ggml-sycl/gemm.hpp"
 
 static bool g_sycl_loaded = false;