diff --git a/examples/Demo/Source/Demos/GridDemo.cpp b/examples/Demo/Source/Demos/GridDemo.cpp
index caaf6eed27..41c8e4d8d4 100644
--- a/examples/Demo/Source/Demos/GridDemo.cpp
+++ b/examples/Demo/Source/Demos/GridDemo.cpp
@@ -27,7 +27,7 @@
 #include "../JuceDemoHeader.h"
 
 // these classes are C++11-only
-#if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
+#if JUCE_HAS_CONSTEXPR
 
 struct GridDemo   : public Component
 {
@@ -119,4 +119,4 @@ struct GridDemo   : public Component
 // This static object will register this demo type in a global list of demos..
 static JuceDemoType<GridDemo> demo ("10 Components: GridDemo");
 
-#endif // JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
+#endif // JUCE_HAS_CONSTEXPR
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
index e0c0bbbe87..a4286c26dc 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
@@ -184,6 +184,8 @@ private:
         void componentParentHierarchyChanged (Component&) override                  { ed.updatePeer(); }
 
         AudioProcessorEditor& ed;
+
+        JUCE_DECLARE_NON_COPYABLE (AudioProcessorEditorListener)
     };
 
     //==============================================================================
diff --git a/modules/juce_core/containers/juce_SortedSet.h b/modules/juce_core/containers/juce_SortedSet.h
index 632b659d2b..3007f43f46 100644
--- a/modules/juce_core/containers/juce_SortedSet.h
+++ b/modules/juce_core/containers/juce_SortedSet.h
@@ -55,19 +55,22 @@ class SortedSet
 public:
     //==============================================================================
     /** Creates an empty set. */
-    SortedSet() noexcept = default;
+    // VS2013 doesn't allow defaulted noexcept constructors.
+    SortedSet() noexcept {}
 
     /** Creates a copy of another set. */
     SortedSet (const SortedSet&) = default;
 
     /** Creates a copy of another set. */
-    SortedSet (SortedSet&&) noexcept = default;
+    // VS2013 doesn't allow defaulted noexcept constructors.
+    SortedSet (SortedSet&& other) noexcept : data (std::move (other.data)) {}
 
     /** Makes a copy of another set. */
     SortedSet& operator= (const SortedSet&) = default;
 
     /** Makes a copy of another set. */
-    SortedSet& operator= (SortedSet&&) noexcept = default;
+    // VS2013 doesn't allow defaulted noexcept constructors.
+    SortedSet& operator= (SortedSet&& other) noexcept { data = std::move (other.data); return *this; }
 
     /** Destructor. */
     ~SortedSet() noexcept {}
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index c3eaa28dc0..828632769c 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -259,10 +259,12 @@ extern bool juce_areThereAnyAlwaysOnTopWindows();
 // these classes are C++11-only
 #if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
  #include "layout/juce_FlexBox.cpp"
- #include "layout/juce_GridItem.cpp"
- #include "layout/juce_Grid.cpp"
- #if JUCE_UNIT_TESTS
-  #include "layout/juce_GridUnitTests.cpp"
+ #if JUCE_HAS_CONSTEXPR
+  #include "layout/juce_GridItem.cpp"
+  #include "layout/juce_Grid.cpp"
+  #if JUCE_UNIT_TESTS
+   #include "layout/juce_GridUnitTests.cpp"
+  #endif
  #endif
 #endif
 
diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h
index 4405ff0c88..2597c67028 100644
--- a/modules/juce_gui_basics/juce_gui_basics.h
+++ b/modules/juce_gui_basics/juce_gui_basics.h
@@ -299,6 +299,9 @@ class DrawableButton;
 #if JUCE_COMPILER_SUPPORTS_INITIALIZER_LISTS
 #include "layout/juce_FlexItem.h"
 #include "layout/juce_FlexBox.h"
+#endif
+
+#if JUCE_HAS_CONSTEXPR
 #include "layout/juce_GridItem.h"
 #include "layout/juce_Grid.h"