diff --git a/include/wups/button_combo/WUPSButtonCombo.h b/include/wups/button_combo/WUPSButtonCombo.h
index 591a3a7..b7435a5 100644
--- a/include/wups/button_combo/WUPSButtonCombo.h
+++ b/include/wups/button_combo/WUPSButtonCombo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include "defines.h"
 
diff --git a/include/wups/button_combo/api.h b/include/wups/button_combo/api.h
index b295d82..894f1c7 100644
--- a/include/wups/button_combo/api.h
+++ b/include/wups/button_combo/api.h
@@ -328,7 +328,7 @@ WUPSButtonCombo_Error WUPSButtonComboAPI_DetectButtonCombo_Blocking(const WUPSBu
 }
 #endif
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include "WUPSButtonCombo.h"
 #include <optional>
diff --git a/include/wups/config/WUPSConfigItemBoolean.h b/include/wups/config/WUPSConfigItemBoolean.h
index 7e5c1ac..e2ccb04 100644
--- a/include/wups/config/WUPSConfigItemBoolean.h
+++ b/include/wups/config/WUPSConfigItemBoolean.h
@@ -84,7 +84,7 @@ WUPSConfigItemBoolean_AddToCategoryEx(WUPSConfigCategoryHandle cat,
 }
 #endif
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include "WUPSConfigItem.h"
 #include <optional>
diff --git a/include/wups/config/WUPSConfigItemButtonCombo.h b/include/wups/config/WUPSConfigItemButtonCombo.h
index cda182b..fb12c8f 100644
--- a/include/wups/config/WUPSConfigItemButtonCombo.h
+++ b/include/wups/config/WUPSConfigItemButtonCombo.h
@@ -61,7 +61,7 @@ WUPSConfigItemButtonCombo_AddToCategory(WUPSConfigCategoryHandle cat,
 #endif
 
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include <optional>
 #include <string>
diff --git a/include/wups/config/WUPSConfigItemIntegerRange.h b/include/wups/config/WUPSConfigItemIntegerRange.h
index 51cced2..3343f5f 100644
--- a/include/wups/config/WUPSConfigItemIntegerRange.h
+++ b/include/wups/config/WUPSConfigItemIntegerRange.h
@@ -59,7 +59,7 @@ WUPSConfigItemIntegerRange_AddToCategory(WUPSConfigCategoryHandle cat,
 #endif
 
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 #include "WUPSConfigItem.h"
 #include <optional>
 #include <span>
diff --git a/include/wups/config/WUPSConfigItemMultipleValues.h b/include/wups/config/WUPSConfigItemMultipleValues.h
index d0c2533..df67df5 100644
--- a/include/wups/config/WUPSConfigItemMultipleValues.h
+++ b/include/wups/config/WUPSConfigItemMultipleValues.h
@@ -64,7 +64,7 @@ WUPSConfigItemMultipleValues_AddToCategory(WUPSConfigCategoryHandle cat, const c
 #endif
 
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include "WUPSConfigItem.h"
 #include <optional>
diff --git a/include/wups/config/WUPSConfigItemStub.h b/include/wups/config/WUPSConfigItemStub.h
index ecff758..9f417fe 100644
--- a/include/wups/config/WUPSConfigItemStub.h
+++ b/include/wups/config/WUPSConfigItemStub.h
@@ -26,7 +26,8 @@ WUPSConfigItemStub_AddToCategory(WUPSConfigCategoryHandle cat, const char *displ
 #ifdef __cplusplus
 }
 #endif
-#ifdef __cplusplus
+
+#if defined(__cplusplus) && __cplusplus >= 201703L
 
 #include "WUPSConfigItem.h"
 #include <optional>