diff --git a/CI/utils/stm32common.py b/CI/utils/stm32common.py
index 45e2adaab1..f1128d8fe6 100644
--- a/CI/utils/stm32common.py
+++ b/CI/utils/stm32common.py
@@ -1,4 +1,3 @@
-import os
 import re
 import shutil
 
@@ -6,22 +5,22 @@
 # Create a folder if not exists
 def createFolder(path):
     try:
-        if not os.path.exists(path):
-            os.makedirs(path)
+        if not path.exists():
+            path.mkdir()
     except OSError:
         print("Error: Creating directory. " + path)
 
 
 # Delete targeted folder recursively
 def deleteFolder(path):
-    if os.path.isdir(path):
+    if path.is_dir():
         shutil.rmtree(path, ignore_errors=True)
 
 
 # copy src folder recursively to dest
 def copyFolder(src, dest, ign_patt=set()):
     try:
-        if os.path.isdir(src):
+        if src.is_dir():
             shutil.copytree(src, dest, ignore=shutil.ignore_patterns(*ign_patt))
     except OSError as e:
         print("Error: Folder %s not copied. %s" % src, e)
@@ -29,15 +28,15 @@ def copyFolder(src, dest, ign_patt=set()):
 
 def genSTM32List(path, pattern):
     stm32_list = []  # Serie
-    dir_pattern = re.compile("^STM32(.*)xx_HAL_Driver$", re.IGNORECASE)
+    dir_pattern = re.compile(r"^STM32(.*)xx_HAL_Driver$", re.IGNORECASE)
 
     if pattern is not None:
         serie_pattern = re.compile(pattern, re.IGNORECASE)
     else:
         serie_pattern = re.compile(".*", re.IGNORECASE)
 
-    for file in os.listdir(path):
-        res = dir_pattern.match(file)
+    for file in path.iterdir():
+        res = dir_pattern.match(file.name)
         if res and serie_pattern.search(res.group(1)):
             stm32_list.append(res.group(1))
     stm32_list.sort()
diff --git a/CI/utils/stm32update.py b/CI/utils/stm32update.py
index ce89eebfab..4797fb4968 100644
--- a/CI/utils/stm32update.py
+++ b/CI/utils/stm32update.py
@@ -2,22 +2,22 @@
 import collections
 import fileinput
 import json
-import os
-from packaging import version
 import re
 import subprocess
-import sys
-from urllib.parse import urljoin
 import stm32wrapper
+import sys
+from packaging import version
+from pathlib import Path
 from stm32common import createFolder, deleteFolder, copyFolder, genSTM32List
+from urllib.parse import urljoin
 
 if sys.platform.startswith("win32"):
     from colorama import init
 
     init(autoreset=True)
 
-script_path = os.path.dirname(os.path.abspath(__file__))
-home = os.path.expanduser("~")
+script_path = Path(__file__).parent.resolve()
+home = Path.home()
 path_config_filename = "update_config.json"
 
 # GitHub
@@ -25,15 +25,15 @@
 gh_core = "https://github.com/stm32duino/Arduino_Core_STM32.git"
 repo_generic_name = "STM32Cube"
 repo_core_name = "Arduino_Core_STM32"
-repo_local_path = os.path.join(home, "STM32Cube_repo")
+repo_local_path = home / "STM32Cube_repo"
 
 # From
 # Relative to repo path
 hal_src_path = "Drivers"
-cmsis_src_path = os.path.join("Drivers", "CMSIS", "Device", "ST")
+cmsis_src_path = Path("Drivers", "CMSIS", "Device", "ST")
 # To
-hal_dest_path = os.path.join("system", "Drivers")
-cmsis_dest_path = os.path.join("system", "Drivers", "CMSIS", "Device", "ST")
+hal_dest_path = Path("system", "Drivers")
+cmsis_dest_path = Path("system", "Drivers", "CMSIS", "Device", "ST")
 
 stm32_list = []  # Serie
 cube_versions = collections.OrderedDict()  # key: serie name, value: cube version
@@ -53,17 +53,27 @@
 out_separator = "-" * 70
 
 
+def execute_cmd(cmd, stderror):
+    try:
+        output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
+    except subprocess.CalledProcessError as e:
+        print("Failed command: ")
+        print(e.cmd)
+        exit(e.returncode)
+    return output
+
+
 def create_config():
     global repo_local_path
 
     # Create a Json file for a better path management
     print(
         "'{}' file created. Please check the configuration.".format(
-            os.path.join(script_path, path_config_filename)
+            script_path / path_config_filename
         )
     )
     path_config_file = open(path_config_filename, "w")
-    path_config_file.write(json.dumps({"REPO_LOCAL_PATH": repo_local_path}, indent=2))
+    path_config_file.write(json.dumps({"REPO_LOCAL_PATH": str(repo_local_path)}, indent=2))
     path_config_file.close()
     exit(1)
 
@@ -74,23 +84,20 @@ def checkConfig():
     global cmsis_dest_path
     global md_HAL_path
     global md_CMSIS_path
-    if os.path.isfile(os.path.join(script_path, path_config_filename)):
+    config_file_path = script_path / path_config_filename
+    if config_file_path.is_file():
         try:
-            path_config_file = open(
-                os.path.join(script_path, path_config_filename), "r"
-            )
-            path_config = json.load(path_config_file)
+            config_file = open(config_file_path, "r")
+            path_config = json.load(config_file)
             # Common path
-            repo_local_path = path_config["REPO_LOCAL_PATH"]
-            path_config_file.close()
-            hal_dest_path = os.path.join(repo_local_path, repo_core_name, hal_dest_path)
-            md_HAL_path = os.path.join(hal_dest_path, md_HAL_path)
-            cmsis_dest_path = os.path.join(
-                repo_local_path, repo_core_name, cmsis_dest_path
-            )
-            md_CMSIS_path = os.path.join(cmsis_dest_path, md_CMSIS_path)
+            repo_local_path = Path(path_config["REPO_LOCAL_PATH"])
+            config_file.close()
+            hal_dest_path = repo_local_path / repo_core_name / hal_dest_path
+            md_HAL_path = hal_dest_path / md_HAL_path
+            cmsis_dest_path = repo_local_path / repo_core_name / cmsis_dest_path
+            md_CMSIS_path = cmsis_dest_path / md_CMSIS_path
         except IOError:
-            print("Failed to open " + path_config_file)
+            print("Failed to open {}!".format(config_file))
     else:
         create_config()
     createFolder(repo_local_path)
@@ -98,9 +105,9 @@ def checkConfig():
 
 def updateCoreRepo():
     # Handle core repo
-    repo_path = os.path.join(repo_local_path, repo_core_name)
-    print("Updating " + repo_core_name + "...")
-    if os.path.exists(repo_path):
+    repo_path = repo_local_path / repo_core_name
+    print("Updating {}...".format(repo_core_name))
+    if repo_path.exists():
         # Get new tags from the remote
         git_cmds = [
             ["git", "-C", repo_path, "clean", "-fdx"],
@@ -110,23 +117,18 @@ def updateCoreRepo():
     else:
         # Clone it as it does not exists yet
         git_cmds = [["git", "-C", repo_local_path, "clone", gh_core]]
-    try:
-        for cmd in git_cmds:
-            subprocess.check_output(cmd).decode("utf-8")
-    except subprocess.CalledProcessError as e:
-        print("Failed command: ")
-        print(e.cmd)
-        sys.exit(e.returncode)
+    for cmd in git_cmds:
+        execute_cmd(cmd, None)
 
 
 def updateSTRepo():
     # Handle STM32Cube repo
     for serie in stm32_list:
         repo_name = repo_generic_name + serie
-        repo_path = os.path.join(repo_local_path, repo_name)
+        repo_path = repo_local_path / repo_name
         gh_STM32Cube = urljoin(gh_st, repo_name + ".git")
         print("Updating " + repo_name + "...")
-        if os.path.exists(repo_path):
+        if repo_path.exists():
             # Get new tags from the remote
             git_cmds = [
                 ["git", "-C", repo_path, "clean", "-fdx"],
@@ -136,13 +138,8 @@ def updateSTRepo():
         else:
             # Clone it as it does not exists yet
             git_cmds = [["git", "-C", repo_local_path, "clone", gh_STM32Cube]]
-        try:
-            for cmd in git_cmds:
-                subprocess.check_output(cmd).decode("utf-8")
-        except subprocess.CalledProcessError as e:
-            print("Failed command: ")
-            print(e.cmd)
-            sys.exit(e.returncode)
+        for cmd in git_cmds:
+            execute_cmd(cmd, None)
         latestTag(serie, repo_name, repo_path)
         checkVersion(serie, repo_path)
 
@@ -150,37 +147,24 @@ def updateSTRepo():
 def latestTag(serie, repo_name, repo_path):
     global cube_versions
     # Checkout the latest tag
-    try:
-        sha1_id = (
-            subprocess.check_output(
-                ["git", "-C", repo_path, "rev-list", "--tags", "--max-count=1"]
-            )
-            .decode("utf-8")
-            .strip()
-        )
-        version_tag = (
-            subprocess.check_output(
-                ["git", "-C", repo_path, "describe", "--tags", sha1_id]
-            )
-            .decode("utf-8")
-            .strip()
-        )
-        subprocess.check_output(
-            ["git", "-C", repo_path, "checkout", version_tag], stderr=subprocess.DEVNULL
-        )
-        cube_versions[serie] = version_tag
-        # print("Latest tagged version available for " + repo_name + " is " + version_tag)
-    except subprocess.CalledProcessError as e:
-        print("Failed command: ")
-        print(e.cmd)
-        sys.exit(e.returncode)
+
+    sha1_id = execute_cmd(
+        ["git", "-C", repo_path, "rev-list", "--tags", "--max-count=1"], None
+    )
+
+    version_tag = execute_cmd(
+        ["git", "-C", repo_path, "describe", "--tags", sha1_id], None
+    )
+    execute_cmd(["git", "-C", repo_path, "checkout", version_tag], subprocess.DEVNULL)
+    cube_versions[serie] = version_tag
+    # print("Latest tagged version available for " + repo_name + " is " + version_tag)
 
 
 def parseVersion(path):
     main_found = False
     sub1_found = False
     sub2_found = False
-    if "HAL" in path:
+    if "HAL" in str(path):
         main_pattern = re.compile(r"HAL_VERSION_MAIN.*0x([\dA-Fa-f]+)")
         sub1_pattern = re.compile(r"HAL_VERSION_SUB1.*0x([\dA-Fa-f]+)")
         sub2_pattern = re.compile(r"HAL_VERSION_SUB2.*0x([\dA-Fa-f]+)")
@@ -208,7 +192,7 @@ def parseVersion(path):
         if main_found and sub1_found and sub2_found:
             break
     else:
-        print("Could not find the full version in " + path)
+        print("Could not find the full version in {}".format(path))
         if main_found:
             print("main version found: {}".format(VERSION_MAIN))
         VERSION_MAIN = "FF"
@@ -224,41 +208,41 @@ def parseVersion(path):
 def checkVersion(serie, repo_path):
     lserie = serie.lower()
     userie = serie.upper()
-    HAL_file = os.path.join(
-        repo_path,
-        hal_src_path,
-        "STM32{}xx_HAL_Driver".format(userie),
-        "Src",
-        "stm32{}xx_hal.c".format(lserie),
+    HAL_file = (
+        repo_path
+        / hal_src_path
+        / "STM32{}xx_HAL_Driver".format(userie)
+        / "Src"
+        / "stm32{}xx_hal.c".format(lserie)
     )
     cube_HAL_versions[serie] = parseVersion(HAL_file)
     if upargs.add:
         core_HAL_versions[serie] = "0.0.0"
     else:
-        HAL_file = os.path.join(
-            hal_dest_path,
-            "STM32{}xx_HAL_Driver".format(userie),
-            "Src",
-            "stm32{}xx_hal.c".format(lserie),
+        HAL_file = (
+            hal_dest_path
+            / "STM32{}xx_HAL_Driver".format(userie)
+            / "Src"
+            / "stm32{}xx_hal.c".format(lserie)
         )
         core_HAL_versions[serie] = parseVersion(HAL_file)
 
-    CMSIS_file = os.path.join(
-        repo_path,
-        cmsis_src_path,
-        "STM32{}xx".format(userie),
-        "Include",
-        "stm32{}xx.h".format(lserie),
+    CMSIS_file = (
+        repo_path
+        / cmsis_src_path
+        / "STM32{}xx".format(userie)
+        / "Include"
+        / "stm32{}xx.h".format(lserie)
     )
     cube_CMSIS_versions[serie] = parseVersion(CMSIS_file)
     if upargs.add:
         core_CMSIS_versions[serie] = "0.0.0"
     else:
-        CMSIS_file = os.path.join(
-            cmsis_dest_path,
-            "STM32{}xx".format(userie),
-            "Include",
-            "stm32{}xx.h".format(lserie),
+        CMSIS_file = (
+            cmsis_dest_path
+            / "STM32{}xx".format(userie)
+            / "Include"
+            / "stm32{}xx.h".format(lserie)
         )
         core_CMSIS_versions[serie] = parseVersion(CMSIS_file)
 
@@ -317,58 +301,51 @@ def printVersion():
 
 # Commit files without trailing space
 def commitFiles(repo_path, commit_msg):
-    try:
-        # Check if there is something to commit
-        status = subprocess.check_output(
-            ["git", "-C", repo_path, "status", "--untracked-files", "--short"]
-        )
-        if not status:
-            return
-        # Staged all files: new, modified and deleted
-        subprocess.check_output(
-            ["git", "-C", repo_path, "add", "--all"], stderr=subprocess.DEVNULL
-        )
-        # Commit all stage files with signoff and message
-        subprocess.check_output(
-            [
-                "git",
-                "-C",
-                repo_path,
-                "commit",
-                "--all",
-                "--signoff",
-                "--message=" + commit_msg,
-            ],
-            stderr=subprocess.DEVNULL,
-        )
-        # Remove trailing space
-        subprocess.check_output(
-            ["git", "-C", repo_path, "rebase", "--whitespace=fix", "HEAD~1"],
-            stderr=subprocess.DEVNULL,
-        )
-    except subprocess.CalledProcessError as e:
-        print("Failed command: ")
-        print(e.cmd)
-        sys.exit(e.returncode)
+    # Check if there is something to commit
+    status = execute_cmd(
+        ["git", "-C", repo_path, "status", "--untracked-files", "--short"], None
+    )
+    if not status:
+        return
+    # Staged all files: new, modified and deleted
+    execute_cmd(["git", "-C", repo_path, "add", "--all"], subprocess.DEVNULL)
+    # Commit all stage files with signoff and message
+    execute_cmd(
+        [
+            "git",
+            "-C",
+            repo_path,
+            "commit",
+            "--all",
+            "--signoff",
+            "--message=" + commit_msg,
+        ],
+        subprocess.DEVNULL,
+    )
+    # Remove trailing space
+    execute_cmd(
+        ["git", "-C", repo_path, "rebase", "--whitespace=fix", "HEAD~1"],
+        subprocess.DEVNULL,
+    )
 
 
 # Apply all patches found for the dedicated serie
 def applyPatch(serie, HAL_updated, CMSIS_updated, repo_path):
     # First check if some patch need to be applied
-    patch_path = os.path.join(script_path, "patch")
+    patch_path = script_path / "patch"
     patch_list = []
     if HAL_updated:
-        HAL_patch_path = os.path.join(patch_path, "HAL", serie)
-        if os.path.isdir(HAL_patch_path):
-            for file in os.listdir(HAL_patch_path):
-                if file.endswith(".patch"):
-                    patch_list.append(os.path.join(HAL_patch_path, file))
+        HAL_patch_path = patch_path / "HAL" / serie
+        if HAL_patch_path.is_dir():
+            for file in HAL_patch_path.iterdir():
+                if file.name.endswith(".patch"):
+                    patch_list.append(HAL_patch_path / file)
     if CMSIS_updated:
-        CMSIS_patch_path = os.path.join(patch_path, "CMSIS", serie)
-        if os.path.isdir(CMSIS_patch_path):
-            for file in os.listdir(CMSIS_patch_path):
-                if file.endswith(".patch"):
-                    patch_list.append(os.path.join(CMSIS_patch_path, file))
+        CMSIS_patch_path = patch_path / "CMSIS" / serie
+        if CMSIS_patch_path.is_dir():
+            for file in CMSIS_patch_path.iterdir():
+                if file.name.endswith(".patch"):
+                    patch_list.append(CMSIS_patch_path / file)
 
     if len(patch_list):
         patch_failed = []
@@ -380,16 +357,16 @@ def applyPatch(serie, HAL_updated, CMSIS_updated, repo_path):
         for patch in patch_list:
             try:
                 # Test the patch before apply it
-                status = subprocess.check_output(
+                status = execute_cmd(
                     ["git", "-C", repo_path, "apply", "--check", patch],
-                    stderr=subprocess.STDOUT,
+                    subprocess.STDOUT,
                 )
                 if status:
                     # print("patch {} can't be applied".format(patch))
                     patch_failed.append([patch, status])
                     continue
                 # Apply the patch
-                status = subprocess.check_output(
+                status = execute_cmd(
                     [
                         "git",
                         "-C",
@@ -399,7 +376,8 @@ def applyPatch(serie, HAL_updated, CMSIS_updated, repo_path):
                         "--quiet",
                         "--signoff",
                         patch,
-                    ]
+                    ],
+                    None,
                 )
             except subprocess.CalledProcessError as e:
                 patch_failed.append([patch, e.cmd, e.output.decode("utf-8")])
@@ -416,8 +394,8 @@ def applyPatch(serie, HAL_updated, CMSIS_updated, repo_path):
 def updateCore():
     for serie in stm32_list:
         cube_name = repo_generic_name + serie
-        cube_path = os.path.join(repo_local_path, cube_name)
-        core_path = os.path.join(repo_local_path, repo_core_name)
+        cube_path = repo_local_path / cube_name
+        core_path = repo_local_path / repo_core_name
         core_HAL_version = core_HAL_versions[serie]
         cube_HAL_version = cube_HAL_versions[serie]
         core_CMSIS_version = core_CMSIS_versions[serie]
@@ -451,13 +429,13 @@ def updateCore():
                 + cube_HAL_version
             )
             # First delete old HAL version
-            HAL_serie_core_path = os.path.join(
-                core_path, hal_dest_path, "STM32{}xx_HAL_Driver".format(serie)
+            HAL_serie_core_path = (
+                core_path / hal_dest_path / "STM32{}xx_HAL_Driver".format(serie)
             )
             deleteFolder(HAL_serie_core_path)
             # Copy new one
-            HAL_serie_cube_path = os.path.join(
-                cube_path, hal_src_path, "STM32{}xx_HAL_Driver".format(serie)
+            HAL_serie_cube_path = (
+                cube_path / hal_src_path / "STM32{}xx_HAL_Driver".format(serie)
             )
             copyFolder(HAL_serie_cube_path, HAL_serie_core_path, {"*.chm"})
             # Update MD file
@@ -491,13 +469,13 @@ def updateCore():
                 + cube_CMSIS_version
             )
             # First delete CMSIS folder
-            CMSIS_serie_dest_path = os.path.join(
-                core_path, cmsis_dest_path, "STM32{}xx".format(serie.upper())
+            CMSIS_serie_dest_path = (
+                core_path / cmsis_dest_path / "STM32{}xx".format(serie.upper())
             )
             deleteFolder(CMSIS_serie_dest_path)
             # Copy new one
-            CMSIS_serie_cube_path = os.path.join(
-                cube_path, cmsis_src_path, "STM32{}xx".format(serie.upper())
+            CMSIS_serie_cube_path = (
+                cube_path / cmsis_src_path / "STM32{}xx".format(serie.upper())
             )
             copyFolder(CMSIS_serie_cube_path, CMSIS_serie_dest_path, {"iar", "arm"})
             # Update MD file
diff --git a/CI/utils/stm32wrapper.py b/CI/utils/stm32wrapper.py
index 4575034ae3..0ca04e7a38 100644
--- a/CI/utils/stm32wrapper.py
+++ b/CI/utils/stm32wrapper.py
@@ -1,22 +1,19 @@
 import argparse
-import glob
 import re
-import os
+from jinja2 import Environment, FileSystemLoader, Template
+from pathlib import Path
 from stm32common import createFolder, deleteFolder, genSTM32List
 
-script_path = os.path.dirname(os.path.abspath(__file__))
-home = os.path.expanduser("~")
+script_path = Path(__file__).parent.resolve()
 # Base path
-core_path = os.path.abspath(os.path.join(script_path, "..", ".."))
+core_path = script_path.parent.parent
 SrcWrapper_path = ""
 HALDrivers_path = ""
 CMSIS_Device_ST_path = ""
 CMSIS_DSP_lib_path = ""
 
 # CMSIS outside of the core. Can be updated by arg
-CMSIS_path = os.path.abspath(
-    os.path.join(core_path, "..", "ArduinoModule-CMSIS", "CMSIS_5")
-)
+CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / "CMSIS_5"
 CMSIS_DSPSrc_path = ""
 
 # Out sources files
@@ -30,10 +27,28 @@
 # Out startup files
 CMSIS_Startupfile = ""
 
-all_LL_file = "stm32yyxx_ll.h"
-
+# List of STM32 series
 stm32_series = []
 
+# Templating
+templates_dir = script_path / "templates"
+all_ll_h_file = "stm32yyxx_ll.h"
+ll_h_file = "stm32yyxx_ll_ppp.h"
+c_file = "stm32yyxx_zz_ppp.c"
+
+# Create the jinja2 environment.
+j2_env = Environment(
+    loader=FileSystemLoader(str(templates_dir)), trim_blocks=True, lstrip_blocks=True
+)
+all_ll_header_file_template = j2_env.get_template(all_ll_h_file)
+ll_h_file_template = j2_env.get_template(ll_h_file)
+c_file_template = j2_env.get_template(c_file)
+dsp_file_template = Template('#include "../Source/{{ dsp }}/{{ dsp }}.c"')
+
+# re
+peripheral_c_regex = re.compile(r"stm32\w+_[h]?[al][l]_(.*).c$")
+peripheral_h_regex = re.compile(r"stm32\w+_(\w+).h$")
+
 
 def checkConfig(arg_core, arg_cmsis):
     global core_path
@@ -50,66 +65,31 @@ def checkConfig(arg_core, arg_cmsis):
     global LLoutInc_path
 
     if arg_core is not None:
-        core_path = arg_core
-        CMSIS_path = os.path.abspath(
-            os.path.join(core_path, "..", "ArduinoModule-CMSIS", "CMSIS_5")
-        )
+        core_path = Path(arg_core).resolve()
+        CMSIS_path = core_path.parent / "ArduinoModule-CMSIS" / "CMSIS_5"
 
-    if not os.path.isdir(core_path):
+    if not core_path.is_dir():
         print("Could not find " + core_path)
         exit(1)
 
-    SrcWrapper_path = os.path.join(core_path, "libraries", "SrcWrapper")
-    HALDrivers_path = os.path.join(core_path, "system", "Drivers")
-    CMSIS_Device_ST_path = os.path.join(
-        core_path, "system", "Drivers", "CMSIS", "Device", "ST"
-    )
-    CMSIS_DSP_lib_path = os.path.join(core_path, "libraries", "CMSIS_DSP")
-    CMSIS_DSP_outSrc_path = os.path.join(CMSIS_DSP_lib_path, "src")
-    CMSIS_Startupfile = os.path.join(
-        core_path, "cores", "arduino", "stm32", "stm32_def_build.h"
-    )
+    SrcWrapper_path = core_path / "libraries" / "SrcWrapper"
+    HALDrivers_path = core_path / "system" / "Drivers"
+    CMSIS_Device_ST_path = core_path / "system" / "Drivers" / "CMSIS" / "Device" / "ST"
+    CMSIS_DSP_lib_path = core_path / "libraries" / "CMSIS_DSP"
+    CMSIS_DSP_outSrc_path = CMSIS_DSP_lib_path / "src"
+    CMSIS_Startupfile = core_path / "cores" / "arduino" / "stm32" / "stm32_def_build.h"
 
-    HALoutSrc_path = os.path.join(SrcWrapper_path, "src", "HAL")
-    LLoutSrc_path = os.path.join(SrcWrapper_path, "src", "LL")
-    LLoutInc_path = os.path.join(core_path, "cores", "arduino", "stm32", "LL")
+    HALoutSrc_path = SrcWrapper_path / "src" / "HAL"
+    LLoutSrc_path = SrcWrapper_path / "src" / "LL"
+    LLoutInc_path = core_path / "cores" / "arduino" / "stm32" / "LL"
 
     if arg_cmsis is not None:
-        CMSIS_path = arg_cmsis
-    CMSIS_DSPSrc_path = os.path.join(CMSIS_path, "CMSIS", "DSP", "Source")
-
-
-# Add some pragma to ll header files to avoid several warnings
-# which will be corrected along Cube update
-def print_LL_header(open_file, name):
-    upper = name.upper().replace(".", "_")
-    open_file.write(
-        """#ifndef _{0}_
-#define _{0}_
-/* LL raised several warnings, ignore them */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored \"-Wunused-parameter\"
-#pragma GCC diagnostic ignored \"-Wstrict-aliasing\"
-
-""".format(
-            upper
-        )
-    )
+        CMSIS_path = Path(arg_cmsis).resolve()
+    CMSIS_DSPSrc_path = CMSIS_path / "CMSIS" / "DSP" / "Source"
 
 
 def printCMSISStartup(log):
-    filelist = sorted(
-        glob.glob(
-            os.path.join(
-                CMSIS_Device_ST_path,
-                "STM32*",
-                "Source",
-                "Templates",
-                "gcc",
-                "startup_*.s",
-            )
-        )
-    )
+    filelist = sorted(CMSIS_Device_ST_path.glob("**/startup_*.s"))
     if len(filelist):
         if log:
             print("Number of startup files: %i" % len(filelist))
@@ -123,7 +103,7 @@ def printCMSISStartup(log):
 """
         )
         # File name
-        fn = os.path.basename(filelist.pop(0))
+        fn = (filelist.pop(0)).name
         valueline = re.split("_|\\.", fn)
         upper = valueline[1].upper().replace("X", "x")
         out_file.write(
@@ -136,7 +116,7 @@ def printCMSISStartup(log):
         if len(filelist):
             for fp in filelist:
                 # File name
-                fn = os.path.basename(fp)
+                fn = fp.name
                 valueline = re.split("_|\\.", fn)
                 if "stm32mp15" in valueline[1] and not valueline[1].endswith("xx"):
                     valueline[1] += "xx"
@@ -178,99 +158,122 @@ def wrap(arg_core, arg_cmsis, log):
     createFolder(LLoutSrc_path)
     deleteFolder(LLoutInc_path)
     createFolder(LLoutInc_path)
-    if os.path.isfile(CMSIS_Startupfile):
-        os.remove(CMSIS_Startupfile)
-    full_ll_list = []
+    if CMSIS_Startupfile.is_file():
+        CMSIS_Startupfile.unlink()
+    all_ll_h_list = []
+    # key: peripheral, value: serie list
+    ll_h_dict = {}
+    ll_c_dict = {}
+    hal_c_dict = {}
     # Search all files for each series
     for serie in stm32_series:
-        src = os.path.join(HALDrivers_path, "STM32" + serie + "xx_HAL_Driver", "Src")
-        inc = os.path.join(HALDrivers_path, "STM32" + serie + "xx_HAL_Driver", "Inc")
+        src = HALDrivers_path / ("STM32" + serie + "xx_HAL_Driver") / "Src"
+        inc = HALDrivers_path / ("STM32" + serie + "xx_HAL_Driver") / "Inc"
 
-        if os.path.exists(src):
+        if src.exists():
             if log:
                 print("Generating for " + serie + "...")
             lower = serie.lower()
-            # Generate stm32yyxx_[hal|ll]*.c file
-            filelist = glob.glob(os.path.join(src, "stm32" + lower + "xx_*.c"))
+
+            # Search stm32yyxx_[hal|ll]*.c file
+            filelist = src.glob("stm32" + lower + "xx_*.c")
             for fp in filelist:
-                if "_template" in fp:
-                    continue
-                outp = HALoutSrc_path
                 # File name
-                fn = os.path.basename(fp)
+                fn = fp.name
+                found = peripheral_c_regex.match(fn)
+                if "_template" in fn:
+                    continue
+                peripheral = found.group(1) if found else "hal"
                 if "_ll_" in fn:
-                    outp = LLoutSrc_path
-                # Compute generic file name with path
-                gp = os.path.join(outp, fn.replace(lower, "yy"))
-                out_file = open(gp, "a", newline="\n")
-                # Amend file name under serie switch
-                out_file.write("#ifdef STM32" + serie + "xx\n")
-                out_file.write('  #include "' + fn + '"\n')
-                out_file.write("#endif\n")
-                out_file.close()
-            # Generate stm32yyxx_ll_*.h file
-            filelist = glob.glob(os.path.join(inc, "stm32" + lower + "xx_ll_*.h"))
+                    if peripheral in ll_c_dict:
+                        ll_c_dict[peripheral].append(lower)
+                    else:
+                        ll_c_dict[peripheral] = [lower]
+                else:
+                    if peripheral in hal_c_dict:
+                        hal_c_dict[peripheral].append(lower)
+                    else:
+                        hal_c_dict[peripheral] = [lower]
+
+            # Search stm32yyxx_ll_*.h file
+            filelist = inc.glob("stm32" + lower + "xx_ll_*.h")
             for fp in filelist:
-                outp = LLoutInc_path
                 # File name
-                fn = os.path.basename(fp)
-                # Compute generic file name
-                gn = fn.replace(lower, "yy")
-                # with path
-                gp = os.path.join(outp, gn)
-                out_file = open(gp, "a", newline="\n")
-                if os.path.getsize(gp) == 0:
-                    print_LL_header(out_file, gn)
-                # Amend full LL header file
-                full_ll_list.append(gn)
-                # Amend file name under serie switch
-                out_file.write("#ifdef STM32" + serie + "xx\n")
-                out_file.write('  #include "' + fn + '"\n')
-                out_file.write("#endif\n")
+                fn = fp.name
+                found = peripheral_h_regex.match(fn)
+                if not found:
+                    continue
+                peripheral = found.group(1)
+                # Amend all LL header list
+                all_ll_h_list.append(fn.replace(lower, "yy"))
+                if peripheral in ll_h_dict:
+                    ll_h_dict[peripheral].append(lower)
+                else:
+                    ll_h_dict[peripheral] = [lower]
+
+            # Generate stm32yyxx_hal_*.c file
+            for key, value in hal_c_dict.items():
+                if key == "hal":
+                    filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace(
+                        "_ppp", ""
+                    )
+                else:
+                    filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace(
+                        "ppp", key
+                    )
+                out_file = open(filepath, "w", newline="\n")
+                out_file.write(
+                    c_file_template.render(periph=key, type="hal", serieslist=value)
+                )
+                out_file.close()
+            # Generate stm32yyxx_ll_*.c file
+            for key, value in ll_c_dict.items():
+                filepath = LLoutSrc_path / c_file.replace("zz", "ll").replace(
+                    "ppp", key
+                )
+                out_file = open(filepath, "w", newline="\n")
+                out_file.write(
+                    c_file_template.render(periph=key, type="ll", serieslist=value)
+                )
+                out_file.close()
+            # Generate stm32yyxx_ll_*.h file
+            for key, value in ll_h_dict.items():
+                filepath = LLoutInc_path / ll_h_file.replace("ppp", key)
+                out_file = open(filepath, "w", newline="\n")
+                out_file.write(ll_h_file_template.render(periph=key, serieslist=value))
                 out_file.close()
             if log:
                 print("done")
 
-    # Filter full LL header file
-    full_ll_file = open(os.path.join(LLoutInc_path, all_LL_file), "w", newline="\n")
-    print_LL_header(full_ll_file, all_LL_file)
-    full_ll_file.write("/* Include Low Layers drivers */\n")
-    full_ll_list = sorted(set(full_ll_list))
-    for hn in full_ll_list:
-        full_ll_file.write('#include "' + hn + '"\n')
-    full_ll_file.close()
-
-    # Search all LL header files to end guard
-    filelist = glob.glob(os.path.join(LLoutInc_path, "stm32yyxx_ll*.h"))
-    for fp in filelist:
-        out_file = open(fp, "a", newline="\n")
-        upper = os.path.basename(fp).upper().replace(".", "_")
-        out_file.write("#pragma GCC diagnostic pop\n")
-        out_file.write("#endif /* _" + upper + "_ */\n")
-        out_file.close()
+    # Filter all LL header file
+    all_ll_h_list = sorted(set(all_ll_h_list))
+    # Generate the all LL header file
+    all_ll_file = open(LLoutInc_path / all_ll_h_file, "w", newline="\n")
+    all_ll_file.write(all_ll_header_file_template.render(ll_header_list=all_ll_h_list))
+    all_ll_file.close()
 
     # CMSIS startup files
     printCMSISStartup(log)
 
     # CMSIS DSP C source file
-    if not os.path.isdir(CMSIS_path):
-        print("Could not find " + CMSIS_path)
+    if not CMSIS_path.is_dir():
+        print("Could not find {}").format(CMSIS_path)
         print("CMSIS DSP generation skipped.")
     else:
         # Delete all subfolders
-        deleteFolder(os.path.join(CMSIS_DSP_outSrc_path, "*"))
+        deleteFolder(CMSIS_DSP_outSrc_path / "*")
         dirlist = []
-        for root, dirs, files in os.walk(CMSIS_DSPSrc_path):
-            for file in files:
-                if file.endswith(".c"):
-                    dirlist.append(root.replace(CMSIS_DSPSrc_path, "")[1:])
+        for path_object in CMSIS_DSPSrc_path.glob("**/*"):
+            if path_object.is_file():
+                if path_object.name.endswith(".c"):
+                    dirlist.append(path_object.parent.name)
         dirlist = sorted(set(dirlist))
         for dn in dirlist:
-            fdn = os.path.join(CMSIS_DSP_outSrc_path, dn)
-            if not os.path.isdir(fdn):
+            fdn = CMSIS_DSP_outSrc_path / dn
+            if not fdn.is_dir():
                 createFolder(fdn)
-                out_file = open(os.path.join(fdn, dn + ".c"), "w", newline="\n")
-                out_file.write('#include "../Source/{0}/{0}.c"\n'.format(dn))
+                out_file = open(fdn / (dn + ".c"), "w", newline="\n")
+                all_ll_file.write(dsp_file_template.render(dsp_path=dn))
                 out_file.close()
     return 0
 
@@ -284,13 +287,13 @@ def wrap(arg_core, arg_cmsis, log):
         "-c",
         "--core",
         metavar="core_path",
-        help="Root path of the STM32 core. Default: " + core_path,
+        help="Root path of the STM32 core. Default: {}".format(core_path),
     )
     wrapparser.add_argument(
         "-s",
         "--cmsis",
         metavar="cmsis_path",
-        help="Root path of the CMSIS. Default: " + CMSIS_path,
+        help="Root path of the CMSIS. Default: {}".format(CMSIS_path),
     )
 
     wrapargs = wrapparser.parse_args()
diff --git a/CI/utils/templates/stm32yyxx_ll.h b/CI/utils/templates/stm32yyxx_ll.h
new file mode 100644
index 0000000000..8145f0cac9
--- /dev/null
+++ b/CI/utils/templates/stm32yyxx_ll.h
@@ -0,0 +1,14 @@
+#ifndef _STM32YYXX_LL_H_
+#define _STM32YYXX_LL_H_
+/* LL raised several warnings, ignore them */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+
+/* Include Low Layers drivers */
+{% for ll_header_name in ll_header_list %}
+#include "{{ll_header_name}}"
+{% endfor %}
+#pragma GCC diagnostic pop
+#endif /* _STM32YYXX_LL_H_ */
+
diff --git a/CI/utils/templates/stm32yyxx_ll_ppp.h b/CI/utils/templates/stm32yyxx_ll_ppp.h
new file mode 100644
index 0000000000..e6fa3a7f0d
--- /dev/null
+++ b/CI/utils/templates/stm32yyxx_ll_ppp.h
@@ -0,0 +1,21 @@
+#ifndef _STM32YYXX_LL_{{periph.upper()}}_H_
+#define _STM32YYXX_LL_{{periph.upper()}}_H_
+/* LL raised several warnings, ignore them */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+
+{% for serie in serieslist %}
+  {% if loop.first %}
+#ifdef STM32{{serie.upper()}}xx
+  {% else %}
+#elif STM32{{serie.upper()}}xx
+  {% endif %}
+  #include "stm32{{serie}}xx_ll_{{periph}}.h"
+  {% if loop.last %}
+#endif
+  {% endif %}
+{% endfor %}
+#pragma GCC diagnostic pop
+#endif /* _STM32YYXX_LL_{{periph.upper()}}_H_ */
+
diff --git a/CI/utils/templates/stm32yyxx_zz_ppp.c b/CI/utils/templates/stm32yyxx_zz_ppp.c
new file mode 100644
index 0000000000..790aeb24d0
--- /dev/null
+++ b/CI/utils/templates/stm32yyxx_zz_ppp.c
@@ -0,0 +1,16 @@
+{% for serie in serieslist %}
+  {% if loop.first %}
+#ifdef STM32{{serie.upper()}}xx
+  {% else %}
+#elif STM32{{serie.upper()}}xx
+  {% endif %}
+  {% if type == periph %}
+  #include "stm32{{serie}}xx_{{type}}.c"
+  {% else %}
+  #include "stm32{{serie}}xx_{{type}}_{{periph}}.c"
+  {% endif %}
+  {% if loop.last %}
+#endif
+  {% endif %}
+{% endfor %}
+
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_adc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_adc.h
index cfa52b461b..6d39fb1d9f 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_adc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_adc.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_adc.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_adc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_adc.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_adc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_adc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_adc.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_adc.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_adc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_adc.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_adc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_adc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_adc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_adc.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_adc.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_adc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_bus.h b/cores/arduino/stm32/LL/stm32yyxx_ll_bus.h
index ede518c89a..ed335acabb 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_bus.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_bus.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_bus.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_bus.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_bus.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_bus.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_bus.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_bus.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_bus.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_bus.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_bus.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_bus.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_bus.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_bus.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_bus.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_bus.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_bus.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_comp.h b/cores/arduino/stm32/LL/stm32yyxx_ll_comp.h
index 28e500239b..794f70f26c 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_comp.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_comp.h
@@ -7,32 +7,23 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_comp.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_comp.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_comp.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_comp.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_comp.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_comp.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_comp.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_comp.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_comp.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_comp.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_cordic.h b/cores/arduino/stm32/LL/stm32yyxx_ll_cordic.h
index 59a625602f..731b4509c2 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_cordic.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_cordic.h
@@ -7,8 +7,7 @@
 
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_cordic.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_cordic.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h b/cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h
index 8ec7194aaa..ebf153c171 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_cortex.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_cortex.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_cortex.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_cortex.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_cortex.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_cortex.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_cortex.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_cortex.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_cortex.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_cortex.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_cortex.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_cortex.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_cortex.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_cortex.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_cortex.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_crc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_crc.h
index 246da1fc8d..09fac9e5b0 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_crc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_crc.h
@@ -7,44 +7,31 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_crc.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_crc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_crc.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_crc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_crc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_crc.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_crc.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_crc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_crc.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_crc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_crc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_crc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_crc.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_crc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_crs.h b/cores/arduino/stm32/LL/stm32yyxx_ll_crs.h
index 977b69a9b4..646b86ca1e 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_crs.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_crs.h
@@ -7,26 +7,19 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_crs.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_crs.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_crs.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_crs.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_crs.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_crs.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_crs.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_crs.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dac.h b/cores/arduino/stm32/LL/stm32yyxx_ll_dac.h
index f45beb67b8..ad9c4c20fd 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_dac.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_dac.h
@@ -7,41 +7,29 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_dac.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_dac.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_dac.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_dac.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_dac.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dac.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_dac.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_dac.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dac.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_dac.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_dac.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dac.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_dac.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.h b/cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.h
index df61992681..3ba87dfab7 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.h
@@ -7,8 +7,7 @@
 
 #ifdef STM32H7xx
   #include "stm32h7xx_ll_delayblock.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_delayblock.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dma.h b/cores/arduino/stm32/LL/stm32yyxx_ll_dma.h
index 741a34ac05..e510f36b00 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_dma.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_dma.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_dma.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_dma.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_dma.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_dma.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_dma.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dma.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_dma.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_dma.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dma.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_dma.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_dma.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dma.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_dma.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_dma.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_dma.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.h b/cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.h
index 29022b342b..15221965eb 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.h
@@ -7,14 +7,11 @@
 
 #ifdef STM32F4xx
   #include "stm32f4xx_ll_dma2d.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dma2d.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dma2d.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dma2d.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dmamux.h b/cores/arduino/stm32/LL/stm32yyxx_ll_dmamux.h
index be40a26281..346747ee1a 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_dmamux.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_dmamux.h
@@ -7,23 +7,17 @@
 
 #ifdef STM32G0xx
   #include "stm32g0xx_ll_dmamux.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_dmamux.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dmamux.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dmamux.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_dmamux.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_dmamux.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_dmamux.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_exti.h b/cores/arduino/stm32/LL/stm32yyxx_ll_exti.h
index 29cfe544b9..85818115ba 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_exti.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_exti.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_exti.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_exti.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_exti.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_exti.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_exti.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_exti.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_exti.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_exti.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_exti.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_exti.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_exti.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_exti.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_exti.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_exti.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_exti.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fmac.h b/cores/arduino/stm32/LL/stm32yyxx_ll_fmac.h
index cd474e1a00..623219debb 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_fmac.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_fmac.h
@@ -7,8 +7,7 @@
 
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_fmac.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_fmac.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fmc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_fmc.h
index d6aaf88aa5..650916b1e8 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_fmc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_fmc.h
@@ -7,26 +7,19 @@
 
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_fmc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_fmc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_fmc.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_fmc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_fmc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_fmc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_fmc.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_fmc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.h
index be04adf5bf..95e87ef232 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.h
@@ -7,14 +7,11 @@
 
 #ifdef STM32F1xx
   #include "stm32f1xx_ll_fsmc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_fsmc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_fsmc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_fsmc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_gpio.h b/cores/arduino/stm32/LL/stm32yyxx_ll_gpio.h
index 8a62d66645..0f2a1de67f 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_gpio.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_gpio.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_gpio.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_gpio.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_gpio.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_gpio.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_gpio.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_gpio.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_gpio.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_gpio.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_gpio.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_gpio.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_gpio.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_gpio.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_gpio.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_gpio.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_gpio.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.h b/cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.h
index fbc8e564c7..3fb48e228d 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.h
@@ -7,11 +7,9 @@
 
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_hrtim.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_hrtim.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_hrtim.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_hsem.h b/cores/arduino/stm32/LL/stm32yyxx_ll_hsem.h
index b976cdcd33..477d1465ed 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_hsem.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_hsem.h
@@ -7,11 +7,9 @@
 
 #ifdef STM32H7xx
   #include "stm32h7xx_ll_hsem.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_hsem.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_hsem.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_i2c.h b/cores/arduino/stm32/LL/stm32yyxx_ll_i2c.h
index 8bcb756e0e..bbe67c832c 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_i2c.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_i2c.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_i2c.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_i2c.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_i2c.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_i2c.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_i2c.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_i2c.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_i2c.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_i2c.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_i2c.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_i2c.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_i2c.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_i2c.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_i2c.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_i2c.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_i2c.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_ipcc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_ipcc.h
index 0c0cf7885a..8277af9b96 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_ipcc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_ipcc.h
@@ -7,8 +7,7 @@
 
 #ifdef STM32MP1xx
   #include "stm32mp1xx_ll_ipcc.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_ipcc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_iwdg.h b/cores/arduino/stm32/LL/stm32yyxx_ll_iwdg.h
index 13a9526f51..9f34047596 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_iwdg.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_iwdg.h
@@ -7,44 +7,31 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_iwdg.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_iwdg.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_iwdg.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_iwdg.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_iwdg.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_iwdg.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_iwdg.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_iwdg.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_iwdg.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_iwdg.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_iwdg.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_iwdg.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_iwdg.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_iwdg.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_lptim.h b/cores/arduino/stm32/LL/stm32yyxx_ll_lptim.h
index 6b2f971f62..b02b6dcb16 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_lptim.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_lptim.h
@@ -7,32 +7,23 @@
 
 #ifdef STM32F4xx
   #include "stm32f4xx_ll_lptim.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_lptim.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_lptim.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_lptim.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_lptim.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_lptim.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_lptim.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_lptim.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_lptim.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_lptim.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.h b/cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.h
index f52c476175..3dc250b2c7 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.h
@@ -7,23 +7,17 @@
 
 #ifdef STM32G0xx
   #include "stm32g0xx_ll_lpuart.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_lpuart.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_lpuart.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_lpuart.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_lpuart.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_lpuart.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_lpuart.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_opamp.h b/cores/arduino/stm32/LL/stm32yyxx_ll_opamp.h
index 3152796a58..4864d75aac 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_opamp.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_opamp.h
@@ -7,20 +7,15 @@
 
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_opamp.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_opamp.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_opamp.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_opamp.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_opamp.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_opamp.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_pka.h b/cores/arduino/stm32/LL/stm32yyxx_ll_pka.h
index ae3b878aba..23102430d4 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_pka.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_pka.h
@@ -7,11 +7,9 @@
 
 #ifdef STM32L4xx
   #include "stm32l4xx_ll_pka.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_pka.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_pka.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_pwr.h b/cores/arduino/stm32/LL/stm32yyxx_ll_pwr.h
index 18405761f6..7d220dad0b 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_pwr.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_pwr.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_pwr.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_pwr.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_pwr.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_pwr.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_pwr.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_pwr.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_pwr.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_pwr.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_pwr.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_pwr.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_pwr.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_pwr.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_pwr.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_pwr.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_pwr.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rcc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_rcc.h
index c7767f10ac..7ce2079f46 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_rcc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_rcc.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_rcc.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_rcc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_rcc.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_rcc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rcc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rcc.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rcc.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rcc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rcc.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rcc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_rcc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rcc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rcc.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_rcc.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rcc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rng.h b/cores/arduino/stm32/LL/stm32yyxx_ll_rng.h
index e900f6945e..7f7930fbcd 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_rng.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_rng.h
@@ -7,32 +7,23 @@
 
 #ifdef STM32F2xx
   #include "stm32f2xx_ll_rng.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rng.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rng.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rng.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rng.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rng.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rng.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rng.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rng.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rng.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rtc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_rtc.h
index dfd85d3091..031d37f77e 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_rtc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_rtc.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_rtc.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_rtc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_rtc.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_rtc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rtc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rtc.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rtc.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rtc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rtc.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rtc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_rtc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rtc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rtc.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_rtc.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rtc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.h b/cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.h
index 06d9ef8e6b..e87325b902 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.h
@@ -7,29 +7,21 @@
 
 #ifdef STM32F1xx
   #include "stm32f1xx_ll_sdmmc.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_sdmmc.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_sdmmc.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_sdmmc.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_sdmmc.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_sdmmc.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_sdmmc.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_sdmmc.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_sdmmc.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_spi.h b/cores/arduino/stm32/LL/stm32yyxx_ll_spi.h
index 76cc4d7c86..e5796faaa9 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_spi.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_spi.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_spi.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_spi.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_spi.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_spi.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_spi.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_spi.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_spi.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_spi.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_spi.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_spi.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_spi.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_spi.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_spi.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_spi.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_spi.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.h b/cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.h
index b754c2aad2..0619deeb1c 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.h
@@ -7,8 +7,7 @@
 
 #ifdef STM32H7xx
   #include "stm32h7xx_ll_swpmi.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_swpmi.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_system.h b/cores/arduino/stm32/LL/stm32yyxx_ll_system.h
index 13ed83037c..89e18d1392 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_system.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_system.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_system.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_system.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_system.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_system.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_system.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_system.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_system.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_system.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_system.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_system.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_system.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_system.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_system.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_system.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_system.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_tim.h b/cores/arduino/stm32/LL/stm32yyxx_ll_tim.h
index d9eb6aa934..ae00d29818 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_tim.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_tim.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_tim.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_tim.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_tim.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_tim.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_tim.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_tim.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_tim.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_tim.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_tim.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_tim.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_tim.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_tim.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_tim.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_tim.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_tim.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.h b/cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.h
index 74a1183d9b..8dfb6c6461 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.h
@@ -7,11 +7,9 @@
 
 #ifdef STM32G0xx
   #include "stm32g0xx_ll_ucpd.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_ucpd.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_ucpd.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_usart.h b/cores/arduino/stm32/LL/stm32yyxx_ll_usart.h
index 5daf97a838..c2d6f3ea87 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_usart.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_usart.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_usart.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_usart.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_usart.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_usart.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_usart.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_usart.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_usart.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_usart.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_usart.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_usart.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_usart.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_usart.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_usart.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_usart.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_usart.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_usb.h b/cores/arduino/stm32/LL/stm32yyxx_ll_usb.h
index 1be3985d54..d7fb68d7cc 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_usb.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_usb.h
@@ -7,44 +7,31 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_usb.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_usb.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_usb.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_usb.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_usb.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_usb.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_usb.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_usb.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_usb.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_usb.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_usb.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_usb.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_usb.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_usb.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_utils.h b/cores/arduino/stm32/LL/stm32yyxx_ll_utils.h
index f24dfcaf6e..9b78831118 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_utils.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_utils.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_utils.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_utils.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_utils.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_utils.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_utils.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_utils.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_utils.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_utils.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_utils.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_utils.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_utils.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_utils.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_utils.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_utils.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_utils.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_wwdg.h b/cores/arduino/stm32/LL/stm32yyxx_ll_wwdg.h
index b6b5b55328..7453f1e9fa 100644
--- a/cores/arduino/stm32/LL/stm32yyxx_ll_wwdg.h
+++ b/cores/arduino/stm32/LL/stm32yyxx_ll_wwdg.h
@@ -7,47 +7,33 @@
 
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_wwdg.h"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_wwdg.h"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_wwdg.h"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_wwdg.h"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_wwdg.h"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_wwdg.h"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_wwdg.h"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_wwdg.h"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_wwdg.h"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_wwdg.h"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_wwdg.h"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_wwdg.h"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_wwdg.h"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_wwdg.h"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_wwdg.h"
 #endif
 #pragma GCC diagnostic pop
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c
index ff87e79e26..9c5c77e85a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c
index de0716a1b1..c138e695a5 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_adc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_adc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_adc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_adc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_adc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_adc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_adc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_adc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_adc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_adc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_adc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_adc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_adc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_adc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_adc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c
index 3055384e42..48f8ec2955 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_adc_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_adc_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_adc_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_adc_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_adc_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_adc_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_adc_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_adc_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_adc_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_adc_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_adc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_adc_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_adc_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_adc_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_adc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
index 390eafe61b..f6f75a347f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
@@ -1,21 +1,15 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_can.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_can.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_can.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_can.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_can.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_can.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_can.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c
index 0faf554265..e3a8139f4a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c
@@ -1,24 +1,17 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_cec.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_cec.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_cec.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_cec.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_cec.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_cec.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_cec.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_cec.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c
index e0a7c36456..2b5ceb1ddb 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c
@@ -1,30 +1,21 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_comp.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_comp.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_comp.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_comp.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_comp.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_comp.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_comp.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_comp.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_comp.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_comp.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c
index 32b40df69c..7055aa8ede 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c
@@ -1,6 +1,5 @@
 #ifdef STM32G4xx
   #include "stm32g4xx_hal_cordic.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_cordic.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c
index 8a9a762b00..212b2203a7 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_cortex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_cortex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_cortex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_cortex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_cortex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_cortex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_cortex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_cortex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_cortex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_cortex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_cortex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_cortex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_cortex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_cortex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_cortex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c
index 1bb969202c..d3cdc2d21b 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_crc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_crc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_crc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_crc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_crc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_crc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_crc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_crc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_crc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_crc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_crc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_crc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_crc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_crc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_crc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c
index 8f12d9bfa0..26496ee3ad 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c
@@ -1,33 +1,23 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_crc_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_crc_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_crc_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_crc_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_crc_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_crc_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_crc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_crc_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_crc_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_crc_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_crc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c
index bffb1eedb5..dd576f0d63 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c
@@ -1,36 +1,25 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_cryp.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_cryp.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_cryp.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_cryp.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_cryp.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_cryp.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_cryp.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_cryp.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_cryp.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_cryp.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_cryp.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_cryp.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c
index 9283998d59..a81b2e6613 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c
@@ -1,33 +1,23 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_cryp_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_cryp_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c
index 1aa1c942be..658c7a5562 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_dac.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_dac.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_dac.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_dac.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dac.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dac.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_dac.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_dac.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dac.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_dac.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_dac.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dac.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dac.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dac.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c
index 12d30d0759..5d28717d21 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_dac_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_dac_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_dac_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_dac_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dac_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dac_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_dac_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_dac_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dac_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_dac_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_dac_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dac_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dac_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dac_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c
index 4960a4e254..761d04405c 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c
@@ -1,18 +1,13 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_dcmi.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dcmi.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dcmi.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dcmi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dcmi.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dcmi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c
index e7e6240618..b6b473ee25 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c
@@ -1,9 +1,7 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_dcmi_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dcmi_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dcmi_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c
index 63f891bb7c..b18dd8aaa2 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c
@@ -1,18 +1,13 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_dfsdm.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dfsdm.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dfsdm.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dfsdm.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dfsdm.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dfsdm.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c
index 8425f22771..f9ceb4ee64 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c
@@ -1,12 +1,9 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_dfsdm_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dfsdm_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dfsdm_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dfsdm_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c
index 478caa919a..375d7484c6 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_dma.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_dma.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_dma.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_dma.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dma.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dma.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_dma.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_dma.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dma.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_dma.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_dma.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dma.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dma.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dma.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_dma.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c
index 41bc3590c1..742c8324f4 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_dma2d.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dma2d.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dma2d.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dma2d.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c
index 8acb01509f..292faefa90 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c
@@ -1,30 +1,21 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_dma_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_dma_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dma_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_dma_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_dma_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dma_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dma_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_dma_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_dma_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_dma_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c
index e03f51bdc5..4eec9569ac 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_dsi.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_dsi.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_dsi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_dsi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
index a0ad996454..6fe9e40e6f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
@@ -1,15 +1,11 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_eth.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_eth.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_eth.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_eth.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_eth.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c
index 73444279cf..bca0ede589 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_exti.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_exti.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_exti.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_exti.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_exti.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_exti.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_exti.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_exti.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_exti.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_exti.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_exti.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_exti.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_exti.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_exti.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_exti.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c
index 2489d0b0cb..cbe390e58a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c
@@ -1,15 +1,11 @@
 #ifdef STM32G0xx
   #include "stm32g0xx_hal_fdcan.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_fdcan.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_fdcan.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_fdcan.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_fdcan.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c
index c64c49462f..e2e00f7481 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c
@@ -1,6 +1,5 @@
 #ifdef STM32L0xx
   #include "stm32l0xx_hal_firewall.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_firewall.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c
index e0965603c8..d8c62cf88f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_flash.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_flash.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_flash.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_flash.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_flash.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_flash.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_flash.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_flash.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_flash.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_flash.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_flash.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_flash.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_flash.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_flash.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c
index ddd3abb451..03def6ee9b 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_flash_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_flash_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_flash_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_flash_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_flash_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_flash_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_flash_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_flash_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_flash_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_flash_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_flash_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_flash_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_flash_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_flash_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c
index 636702b96c..519fdfbc65 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c
@@ -1,18 +1,13 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_flash_ramfunc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_flash_ramfunc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_flash_ramfunc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_flash_ramfunc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_flash_ramfunc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_flash_ramfunc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c
index 4472508dc3..63f14f3680 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c
@@ -1,6 +1,5 @@
 #ifdef STM32G4xx
   #include "stm32g4xx_hal_fmac.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_fmac.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c
index 57da0567fe..fbfc792305 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_gfxmmu.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_gfxmmu.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c
index a4c628abcb..8c210fe419 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_gpio.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_gpio.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_gpio.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_gpio.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_gpio.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_gpio.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_gpio.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_gpio.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_gpio.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_gpio.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_gpio.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_gpio.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_gpio.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_gpio.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_gpio.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c
index f1bb61c83c..d0dead27c8 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c
@@ -1,21 +1,15 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_hash.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_hash.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_hash.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_hash.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_hash.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_hash.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_hash.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c
index 37fca7748f..f20809e006 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c
@@ -1,18 +1,13 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_hash_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_hash_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_hash_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_hash_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_hash_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_hash_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
index c750360f67..86c74664d6 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
@@ -1,21 +1,15 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_hcd.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_hcd.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_hcd.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_hcd.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_hcd.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_hcd.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_hcd.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c
index ef7baecef5..aae8aa40fb 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c
@@ -1,9 +1,7 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_hal_hrtim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_hrtim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_hrtim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c
index 0eafa87b03..b834336654 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c
@@ -1,9 +1,7 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_hsem.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_hsem.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_hsem.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c
index 6f9dcf2f80..fc8b3abd06 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_i2c.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_i2c.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_i2c.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_i2c.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_i2c.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_i2c.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_i2c.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_i2c.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_i2c.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_i2c.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_i2c.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_i2c.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_i2c.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_i2c.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_i2c.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c
index 5a6f5687bb..610ef5f004 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c
@@ -1,36 +1,25 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_i2c_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_i2c_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c
index dd933a19cc..2f88b3a89a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c
@@ -1,33 +1,23 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_i2s.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_i2s.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_i2s.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_i2s.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_i2s.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_i2s.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_i2s.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_i2s.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_i2s.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_i2s.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_i2s.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c
index cad328fb86..fa97cfda4e 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c
@@ -1,9 +1,7 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_hal_i2s_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_i2s_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_i2s_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c
index 71556c2126..1b13a1da27 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c
@@ -1,6 +1,5 @@
 #ifdef STM32MP1xx
   #include "stm32mp1xx_hal_ipcc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_ipcc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c
index b3eb527f5c..37754f3601 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_irda.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_irda.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_irda.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_irda.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_irda.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_irda.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_irda.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_irda.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_irda.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_irda.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_irda.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_irda.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_irda.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_irda.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c
index 8dd5afc5b3..527f535bef 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_iwdg.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_iwdg.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_iwdg.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_iwdg.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_iwdg.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_iwdg.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_iwdg.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_iwdg.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_iwdg.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_iwdg.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_iwdg.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_iwdg.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_iwdg.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_iwdg.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
index 46784424b1..8f9bf4d65f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
@@ -1,6 +1,5 @@
 #ifdef STM32F7xx
   #include "stm32f7xx_hal_jpeg.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_jpeg.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c
index db7a32bee3..1ff37ff119 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c
@@ -1,12 +1,9 @@
 #ifdef STM32L0xx
   #include "stm32l0xx_hal_lcd.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_lcd.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_lcd.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_lcd.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c
index ef2c0e7da9..a556fafa7b 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c
@@ -1,30 +1,21 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_lptim.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_lptim.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_lptim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_lptim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_lptim.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_lptim.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_lptim.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_lptim.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_lptim.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_lptim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c
index 0a743ab16f..044bd08b3f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_ltdc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_ltdc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_ltdc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_ltdc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c
index 3f341fece7..ef62923571 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_ltdc_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_ltdc_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_ltdc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_ltdc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c
index 21bd5a55a3..e30dd861c3 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c
@@ -1,9 +1,7 @@
 #ifdef STM32F7xx
   #include "stm32f7xx_hal_mdios.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_mdios.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_mdios.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c
index 07bbfaa2e5..b149867aab 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_mdma.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_mdma.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c
index 8d4bdd3bdb..ec1b1254ea 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c
@@ -1,21 +1,15 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_mmc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_mmc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_mmc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_mmc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_mmc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_mmc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_mmc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c
index bb881401d7..e75e4ca851 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c
@@ -1,9 +1,7 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_mmc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_mmc_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_mmc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c
index 96e7df425d..3baaad52f6 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c
@@ -1,27 +1,19 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_nand.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_nand.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_nand.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_nand.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_nand.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_nand.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_nand.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_nand.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_nand.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c
index 3de5d2bebd..4f0fb40424 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c
@@ -1,30 +1,21 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_nor.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_nor.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_nor.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_nor.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_nor.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_nor.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_nor.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_nor.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_nor.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_nor.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c
index 21b27104ec..10bb4d34f7 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c
@@ -1,18 +1,13 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_hal_opamp.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_opamp.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_opamp.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_opamp.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_opamp.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_opamp.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c
index b28c4e66aa..9688711d8c 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c
@@ -1,18 +1,13 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_hal_opamp_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_opamp_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_opamp_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_opamp_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_opamp_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_opamp_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c
index 5853225164..1d7a94f694 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c
@@ -1,9 +1,7 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_ospi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_ospi.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_ospi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_otfdec.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_otfdec.c
index 16f81398db..4df841200d 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_otfdec.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_otfdec.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_otfdec.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_otfdec.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c
index 62db5b1c12..4c2c5058d6 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c
@@ -1,12 +1,9 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_pccard.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_pccard.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_pccard.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_pccard.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
index 5a5d82b213..8af54b255d 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_pcd.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_pcd.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_pcd.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_pcd.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_pcd.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_pcd.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_pcd.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_pcd.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_pcd.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_pcd.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_pcd.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_pcd.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_pcd.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_pcd.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
index 1cdbab3eba..dd58499c91 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_pcd_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_pcd_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c
index f3c087b72f..697d74caa2 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c
@@ -1,9 +1,7 @@
 #ifdef STM32L4xx
   #include "stm32l4xx_hal_pka.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_pka.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_pka.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pssi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pssi.c
index a142d8f9f3..3d11effaf9 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pssi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pssi.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_pssi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_pssi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c
index 95e8a2fddd..d2fcefb214 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_pwr.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_pwr.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_pwr.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_pwr.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_pwr.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_pwr.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_pwr.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_pwr.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_pwr.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_pwr.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_pwr.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_pwr.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_pwr.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_pwr.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_pwr.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c
index 1bc02acf0c..58f3dacc32 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_pwr_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_pwr_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c
index 54949dd6b3..de142f58eb 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c
@@ -1,21 +1,15 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_qspi.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_qspi.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_qspi.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_qspi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_qspi.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_qspi.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_qspi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c
index 2c08ac6344..2f5bdc8640 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_rcc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_rcc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_rcc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_rcc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_rcc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_rcc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_rcc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_rcc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_rcc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_rcc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_rcc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rcc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rcc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_rcc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_rcc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c
index 5d11e282ab..356613da8c 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_rcc_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_rcc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c
index d58a89537f..41422c88f0 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c
@@ -1,33 +1,23 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_hal_rng.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_rng.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_rng.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_rng.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_rng.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_rng.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_rng.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rng.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rng.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_rng.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_rng.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng_ex.c
index cbc27f3daf..65775f5246 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng_ex.c
@@ -1,9 +1,7 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_rng_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rng_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rng_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c
index cca4dd80ab..197ca8153f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_rtc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_rtc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_rtc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_rtc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_rtc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_rtc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_rtc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_rtc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_rtc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_rtc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_rtc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rtc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rtc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_rtc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_rtc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c
index cbd8021a79..e51a93d513 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_rtc_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_rtc_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c
index 2fdf4390d0..ae497a9378 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c
@@ -1,24 +1,17 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_sai.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_sai.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_sai.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_sai.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_sai.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_sai.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_sai.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_sai.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c
index 06b19486fa..285df0142c 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c
@@ -1,24 +1,17 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_sai_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_sai_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_sai_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_sai_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_sai_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_sai_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_sai_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_sai_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c
index e1f71ccfbd..b351de70e2 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c
@@ -1,27 +1,19 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_sd.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_sd.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_sd.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_sd.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_sd.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_sd.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_sd.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_sd.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_sd.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c
index ed96990fb2..4b549017af 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c
@@ -1,12 +1,9 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_sd_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_sd_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_sd_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_sd_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c
index be92e9be72..cac4da503a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c
@@ -1,9 +1,7 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_sdram.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_sdram.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_sdram.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c
index 501d086c1b..6d6369c0b8 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_smartcard.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_smartcard.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_smartcard.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_smartcard.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_smartcard.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_smartcard.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_smartcard.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_smartcard.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_smartcard.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_smartcard.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_smartcard.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_smartcard.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_smartcard.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_smartcard.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_smartcard.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c
index 3b45396506..798189d577 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c
@@ -1,33 +1,23 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_smartcard_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_smartcard_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
index bdf6070113..51b08a1943 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
@@ -1,36 +1,25 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_smbus.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_smbus.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_smbus.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_smbus.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_smbus.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_smbus.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_smbus.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_smbus.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_smbus.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_smbus.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_smbus.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_smbus.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c
index a744477bb8..e3e4c63d2a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c
@@ -1,12 +1,9 @@
 #ifdef STM32G4xx
   #include "stm32g4xx_hal_smbus_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_smbus_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_smbus_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_smbus_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c
index 29c3fa3bb5..876b3d9bb0 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_hal_spdifrx.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_spdifrx.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_spdifrx.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_spdifrx.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c
index 7a09c350a1..c29183cb38 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_spi.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_spi.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_spi.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_spi.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_spi.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_spi.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_spi.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_spi.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_spi.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_spi.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_spi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_spi.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_spi.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_spi.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_spi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c
index 86d08d5c97..6031797dc7 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c
@@ -1,30 +1,21 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_spi_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_spi_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_spi_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_spi_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_spi_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_spi_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_spi_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_spi_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_spi_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_spi_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c
index b72a20992e..2499cb763f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c
@@ -1,33 +1,23 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_hal_sram.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_sram.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_sram.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_sram.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_sram.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_sram.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_sram.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_sram.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_sram.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_sram.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_sram.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c
index b5c28094bd..966e139fbc 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_hal_swpmi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_swpmi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c
index 7180516105..4648d61624 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_tim.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_tim.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_tim.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_tim.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_tim.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_tim.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_tim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_tim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_tim.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_tim.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_tim.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_tim.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_tim.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_tim.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_tim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c
index 18fbbb0c67..b92f9e5ee8 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_tim_ex.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_tim_ex.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_tim_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_tim_ex.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_tim_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_tim_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_tim_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_tim_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_tim_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_tim_ex.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_tim_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_tim_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_tim_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_tim_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_tim_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c
index e3264c08e1..9d1b601c8f 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c
@@ -1,18 +1,13 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_tsc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_tsc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_tsc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_tsc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_tsc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_tsc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c
index 99963c5333..fc5f89317e 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_uart.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_uart.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_uart.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_uart.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_uart.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_uart.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_uart.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_uart.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_uart.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_uart.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_uart.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_uart.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_uart.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_uart.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_uart.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c
index 3d2757e767..89acbe3c61 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c
@@ -1,33 +1,23 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_uart_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_uart_ex.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_uart_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_uart_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_uart_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_uart_ex.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_uart_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_uart_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_uart_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_uart_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_uart_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c
index 0e555c45d8..4cda38f999 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_usart.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_usart.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_usart.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_usart.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_usart.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_usart.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_usart.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_usart.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_usart.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_usart.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_usart.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_usart.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_usart.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_usart.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_usart.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c
index 0bd1723676..59bb9d4128 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c
@@ -1,27 +1,19 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_usart_ex.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_usart_ex.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_usart_ex.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_usart_ex.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_usart_ex.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_usart_ex.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_usart_ex.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_usart_ex.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_usart_ex.c"
 #endif
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c
index e920be55c8..b9603a4d03 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_hal_wwdg.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_hal_wwdg.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_hal_wwdg.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_hal_wwdg.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_hal_wwdg.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_hal_wwdg.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_hal_wwdg.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_hal_wwdg.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_hal_wwdg.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_hal_wwdg.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_hal_wwdg.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_hal_wwdg.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_hal_wwdg.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_hal_wwdg.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_hal_wwdg.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c
index 5407108e80..69ae826dac 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_adc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_adc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_adc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_adc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_adc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_adc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_adc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_adc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_adc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_adc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_adc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_adc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_adc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_adc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_adc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c
index 4d1cc4ba75..46f3a1461a 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c
@@ -1,30 +1,21 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_comp.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_comp.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_comp.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_comp.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_comp.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_comp.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_comp.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_comp.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_comp.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_comp.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c
index 563210dd6c..3280691e96 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c
@@ -1,6 +1,5 @@
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_cordic.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_cordic.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c
index 4b0b6cfb8f..01b97356cf 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_crc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_crc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_crc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_crc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_crc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_crc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_crc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_crc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_crc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_crc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_crc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_crc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_crc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_crc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c
index b59b4abaa3..fc57dd167a 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c
@@ -1,24 +1,17 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_crs.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_crs.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_crs.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_crs.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_crs.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_crs.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_crs.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_crs.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c
index 493ca87f09..b629b764ad 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c
@@ -1,39 +1,27 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_dac.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_dac.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_dac.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_dac.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_dac.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dac.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_dac.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_dac.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dac.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_dac.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_dac.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dac.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_dac.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c
index c681b06c61..90d5f7522f 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_ll_delayblock.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_delayblock.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c
index 8c3faed3e3..6f6be58958 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_dma.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_dma.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_dma.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_dma.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_dma.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dma.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_dma.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_dma.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dma.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_dma.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_dma.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dma.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_dma.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_dma.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_dma.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c
index d54b34530d..5c1c1b6967 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c
@@ -1,12 +1,9 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_ll_dma2d.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_dma2d.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_dma2d.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_dma2d.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c
index e200b05951..76e90392bf 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_exti.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_exti.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_exti.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_exti.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_exti.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_exti.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_exti.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_exti.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_exti.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_exti.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_exti.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_exti.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_exti.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_exti.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_exti.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c
index 49b2f394f8..e8dbe96aa0 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c
@@ -1,6 +1,5 @@
 #ifdef STM32G4xx
   #include "stm32g4xx_ll_fmac.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_fmac.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c
index 963fb5601a..f46ce18908 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c
@@ -1,24 +1,17 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_fmc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_fmc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_fmc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_fmc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_fmc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_fmc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_fmc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_fmc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c
index 9e1b0bb21e..9fc04acc0a 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c
@@ -1,12 +1,9 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_ll_fsmc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_fsmc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_fsmc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_fsmc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c
index 672a9ca61d..23634af39f 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_gpio.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_gpio.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_gpio.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_gpio.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_gpio.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_gpio.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_gpio.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_gpio.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_gpio.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_gpio.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_gpio.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_gpio.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_gpio.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_gpio.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_gpio.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c
index e04eeefda0..d6805b4c21 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c
@@ -1,9 +1,7 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_hrtim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_hrtim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_hrtim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c
index 98786f9f20..63fe55ddd0 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_i2c.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_i2c.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_i2c.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_i2c.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_i2c.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_i2c.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_i2c.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_i2c.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_i2c.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_i2c.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_i2c.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_i2c.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_i2c.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_i2c.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_i2c.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c
index fe14102fb8..b00e47aa65 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c
@@ -1,30 +1,21 @@
 #ifdef STM32F4xx
   #include "stm32f4xx_ll_lptim.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_lptim.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_lptim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_lptim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_lptim.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_lptim.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_lptim.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_lptim.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_lptim.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_lptim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c
index aec7712c73..28dc273fd3 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c
@@ -1,21 +1,15 @@
 #ifdef STM32G0xx
   #include "stm32g0xx_ll_lpuart.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_lpuart.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_lpuart.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_lpuart.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_lpuart.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_lpuart.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_lpuart.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c
index 94d9ad1fa0..e6d420943c 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c
@@ -1,18 +1,13 @@
 #ifdef STM32F3xx
   #include "stm32f3xx_ll_opamp.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_opamp.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_opamp.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_opamp.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_opamp.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_opamp.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c
index b84934b77a..afc7ccd810 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c
@@ -1,9 +1,7 @@
 #ifdef STM32L4xx
   #include "stm32l4xx_ll_pka.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_pka.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_pka.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c
index 367bcca988..4a5f2e8449 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_pwr.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_pwr.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_pwr.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_pwr.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_pwr.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_pwr.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_pwr.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_pwr.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_pwr.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_pwr.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_pwr.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_pwr.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_pwr.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_pwr.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_pwr.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c
index d396a4b7e9..2142196826 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_rcc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_rcc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_rcc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_rcc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rcc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rcc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rcc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rcc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rcc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rcc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_rcc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rcc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rcc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_rcc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rcc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c
index 3678269b64..48c2b901b8 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c
@@ -1,30 +1,21 @@
 #ifdef STM32F2xx
   #include "stm32f2xx_ll_rng.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rng.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rng.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rng.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rng.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rng.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rng.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rng.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rng.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rng.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c
index c7f70d1e92..5b6f897db7 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_rtc.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_rtc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_rtc.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_rtc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_rtc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_rtc.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_rtc.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_rtc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_rtc.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_rtc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_rtc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_rtc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_rtc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_rtc.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_rtc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c
index f2d38b3ae0..d1679dcf76 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c
@@ -1,27 +1,19 @@
 #ifdef STM32F1xx
   #include "stm32f1xx_ll_sdmmc.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_sdmmc.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_sdmmc.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_sdmmc.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_sdmmc.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_sdmmc.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_sdmmc.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_sdmmc.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_sdmmc.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c
index 982ac06830..1837de5003 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_spi.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_spi.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_spi.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_spi.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_spi.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_spi.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_spi.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_spi.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_spi.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_spi.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_spi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_spi.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_spi.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_spi.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_spi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c
index 4f00773b63..6d09bdbedb 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c
@@ -1,6 +1,5 @@
 #ifdef STM32H7xx
   #include "stm32h7xx_ll_swpmi.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_swpmi.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c
index 846a0311e5..8cd4466724 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_tim.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_tim.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_tim.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_tim.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_tim.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_tim.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_tim.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_tim.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_tim.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_tim.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_tim.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_tim.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_tim.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_tim.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_tim.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c
index c0f4865661..899958cbb8 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c
@@ -1,9 +1,7 @@
 #ifdef STM32G0xx
   #include "stm32g0xx_ll_ucpd.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_ucpd.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_ucpd.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c
index 0232b29f14..6988a90afe 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_usart.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_usart.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_usart.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_usart.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_usart.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_usart.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_usart.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_usart.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_usart.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_usart.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_usart.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_usart.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_usart.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_usart.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_usart.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
index 5e69393f83..8d481e0c22 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
@@ -1,42 +1,29 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_usb.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_usb.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_usb.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_usb.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_usb.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_usb.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_usb.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_usb.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_usb.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_usb.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_usb.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_usb.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_usb.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_usb.c"
 #endif
diff --git a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c
index 861339f1fd..f170575ecc 100644
--- a/libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c
+++ b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c
@@ -1,45 +1,31 @@
 #ifdef STM32F0xx
   #include "stm32f0xx_ll_utils.c"
-#endif
-#ifdef STM32F1xx
+#elif STM32F1xx
   #include "stm32f1xx_ll_utils.c"
-#endif
-#ifdef STM32F2xx
+#elif STM32F2xx
   #include "stm32f2xx_ll_utils.c"
-#endif
-#ifdef STM32F3xx
+#elif STM32F3xx
   #include "stm32f3xx_ll_utils.c"
-#endif
-#ifdef STM32F4xx
+#elif STM32F4xx
   #include "stm32f4xx_ll_utils.c"
-#endif
-#ifdef STM32F7xx
+#elif STM32F7xx
   #include "stm32f7xx_ll_utils.c"
-#endif
-#ifdef STM32G0xx
+#elif STM32G0xx
   #include "stm32g0xx_ll_utils.c"
-#endif
-#ifdef STM32G4xx
+#elif STM32G4xx
   #include "stm32g4xx_ll_utils.c"
-#endif
-#ifdef STM32H7xx
+#elif STM32H7xx
   #include "stm32h7xx_ll_utils.c"
-#endif
-#ifdef STM32L0xx
+#elif STM32L0xx
   #include "stm32l0xx_ll_utils.c"
-#endif
-#ifdef STM32L1xx
+#elif STM32L1xx
   #include "stm32l1xx_ll_utils.c"
-#endif
-#ifdef STM32L4xx
+#elif STM32L4xx
   #include "stm32l4xx_ll_utils.c"
-#endif
-#ifdef STM32L5xx
+#elif STM32L5xx
   #include "stm32l5xx_ll_utils.c"
-#endif
-#ifdef STM32MP1xx
+#elif STM32MP1xx
   #include "stm32mp1xx_ll_utils.c"
-#endif
-#ifdef STM32WBxx
+#elif STM32WBxx
   #include "stm32wbxx_ll_utils.c"
 #endif