2 files changed, 3 insertions, 2 deletions
diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py
index b86115893f9..debd7345f60 100755
--- a/src/vpp-api/vapi/vapi_c_gen.py
+++ b/src/vpp-api/vapi/vapi_c_gen.py
@@ -712,7 +712,7 @@ def gen_json_unified_header(parser, logger, j, io, name):
     sys.stdout = io
     include_guard = "__included_%s" % (
         j.replace(".", "_").replace("/", "_").replace("-", "_").replace(
-            "+", "_"))
+            "+", "_").replace("@", "_"))
     print("#ifndef %s" % include_guard)
     print("#define %s" % include_guard)
     print("")
diff --git a/src/vpp-api/vapi/vapi_cpp_gen.py b/src/vpp-api/vapi/vapi_cpp_gen.py
index c6aa009cbb9..7bc2e7fecf0 100755
--- a/src/vpp-api/vapi/vapi_cpp_gen.py
+++ b/src/vpp-api/vapi/vapi_cpp_gen.py
@@ -139,7 +139,8 @@ def gen_json_header(parser, logger, j, io, gen_h_prefix, add_debug_comments):
     sys.stdout = io
     d, f = os.path.split(j)
     include_guard = "__included_hpp_%s" % (
-        f.replace(".", "_").replace("/", "_").replace("-", "_"))
+        f.replace(".", "_").replace("/", "_").replace("-", "_").replace(
+            "@", "_"))
     print("#ifndef %s" % include_guard)
     print("#define %s" % include_guard)
     print("")