reorganize If statements to include proper headers

Author: YellowRoseCx

ggml.c

@@ -161,9 +161,11 @@ inline static void* ggml_aligned_malloc(size_t size) {
 #endif
 #elif defined(GGML_USE_OPENBLAS)
 #include <cblas.h>
-#elif defined(GGML_USE_CUBLAS) || defined(GGML_USE_HIPBLAS)
+#endif
+#if defined(GGML_USE_CUBLAS) || defined(GGML_USE_HIPBLAS)
 #include "ggml-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml-opencl.h"
 #endif
 

otherarch/ggml_v2.c

@@ -139,14 +139,17 @@ inline static void* ggml_v2_aligned_malloc(size_t size) {
 #include <Accelerate/Accelerate.h>
 #elif defined(GGML_USE_OPENBLAS)
 #include <cblas.h>
-#elif defined(GGML_USE_CUBLAS) || defined(GGML_USE_HIPBLAS)
+#endif
+#if defined(GGML_USE_CUBLAS) || defined(GGML_USE_HIPBLAS)
 #include "ggml_v2-cuda.h"
 #endif
 #if defined(GGML_USE_CLBLAST)
 #include "ggml_v2-opencl.h"
 #include "ggml_v2-opencl-legacy.h"
 #endif
 
+
+
 #undef MIN
 #undef MAX
 #define MIN(a, b) ((a) < (b) ? (a) : (b))