diff --git a/src/util/format/u_format_table.py b/src/util/format/u_format_table.py
index 9b7c3157e59..fdab1a2e069 100644
--- a/src/util/format/u_format_table.py
+++ b/src/util/format/u_format_table.py
@@ -143,8 +143,17 @@ def write_format_table(formats):
 
     write_format_table_header(sys.stdout2)
 
+    print('#ifdef __cplusplus', file=sys.stdout2)
+    print('extern "C" {', file=sys.stdout2)
+    print('#endif', file=sys.stdout2)
+    print(file=sys.stdout2)
+
     u_format_pack.generate(formats)
 
+    print('#ifdef __cplusplus', file=sys.stdout2)
+    print('} /* extern "C" */', file=sys.stdout2)
+    print('#endif', file=sys.stdout2)
+
     def do_channel_array(channels, swizzles):
         print("   {")
         for i in range(4):