diff --git a/examples/Demo/Source/Demos/FlexBoxDemo.cpp b/examples/Demo/Source/Demos/FlexBoxDemo.cpp
index bd8f9d7f85..6d15e36115 100644
--- a/examples/Demo/Source/Demos/FlexBoxDemo.cpp
+++ b/examples/Demo/Source/Demos/FlexBoxDemo.cpp
@@ -24,7 +24,8 @@
 
 #include "../JuceDemoHeader.h"
 
-#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS // the FlexBox classes are C++11-only
+// these classes are C++11-only
+#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS && JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS
 
 struct DemoFlexPanel   : public juce::Component,
                          private juce::TextEditor::Listener,
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index cb22e22b7f..4358c7be6f 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -253,7 +253,8 @@ extern bool juce_areThereAnyAlwaysOnTopWindows();
 #include "misc/juce_BubbleComponent.cpp"
 #include "misc/juce_DropShadower.cpp"
 
-#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS // these classes are C++11-only
+// these classes are C++11-only
+#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS && JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS
  #include "layout/juce_FlexBox.cpp"
 #endif
 
diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h
index ad3d2e6b70..453567732f 100644
--- a/modules/juce_gui_basics/juce_gui_basics.h
+++ b/modules/juce_gui_basics/juce_gui_basics.h
@@ -282,7 +282,8 @@ class FlexBox;
 #include "lookandfeel/juce_LookAndFeel_V1.h"
 #include "lookandfeel/juce_LookAndFeel_V3.h"
 
-#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS // these classes are C++11-only
+// these classes are C++11-only
+#if JUCE_COMPILER_SUPPORTS_MOVE_SEMANTICS && JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS && JUCE_COMPILER_SUPPORTS_LAMBDAS
 #include "layout/juce_FlexItem.h"
 #include "layout/juce_FlexBox.h"
 #endif