diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp
index fda825dc54..2ea0b64bca 100644
--- a/modules/juce_audio_devices/juce_audio_devices.cpp
+++ b/modules/juce_audio_devices/juce_audio_devices.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_audio_devices.h"
 
diff --git a/modules/juce_audio_formats/juce_audio_formats.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp
index 3b285a84ea..112f0def09 100644
--- a/modules/juce_audio_formats/juce_audio_formats.cpp
+++ b/modules/juce_audio_formats/juce_audio_formats.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_audio_formats.h"
 
diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
index b70f5f7deb..62c082370f 100644
--- a/modules/juce_audio_processors/juce_audio_processors.cpp
+++ b/modules/juce_audio_processors/juce_audio_processors.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_audio_processors.h"
 #include "../juce_gui_extra/juce_gui_extra.h"
diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp
index 3eb2f73e86..6e89f957ff 100644
--- a/modules/juce_audio_utils/juce_audio_utils.cpp
+++ b/modules/juce_audio_utils/juce_audio_utils.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_audio_utils.h"
 
diff --git a/modules/juce_browser_plugin/juce_browser_plugin.cpp b/modules/juce_browser_plugin/juce_browser_plugin.cpp
index 9941b73a04..878c3e53ef 100644
--- a/modules/juce_browser_plugin/juce_browser_plugin.cpp
+++ b/modules/juce_browser_plugin/juce_browser_plugin.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 
 #if _MSC_VER
diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index 5c2ef40d9d..bbb47d4989 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -37,7 +37,6 @@
 #include "AppConfig.h"
 
 //==============================================================================
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "native/juce_BasicNativeHeaders.h"
 #include "juce_core.h"
 
diff --git a/modules/juce_core/text/juce_CharacterFunctions.h b/modules/juce_core/text/juce_CharacterFunctions.h
index 9d61828207..b9e12176d8 100644
--- a/modules/juce_core/text/juce_CharacterFunctions.h
+++ b/modules/juce_core/text/juce_CharacterFunctions.h
@@ -48,21 +48,18 @@
  typedef uint32         juce_wchar;
 #endif
 
-/** This macro is deprecated, but preserved for compatibility with old code.*/
-#define JUCE_T(stringLiteral)          (L##stringLiteral)
+/** This macro is deprecated, but preserved for compatibility with old code. */
+#define JUCE_T(stringLiteral)   (L##stringLiteral)
 
-#if ! JUCE_DONT_DEFINE_MACROS
+#if JUCE_DEFINE_T_MACRO
  /** The 'T' macro is an alternative for using the "L" prefix in front of a string literal.
 
-     This macro is deprectated, but kept here for compatibility with old code. The best (i.e.
-     most portable) way to encode your string literals is just as standard 8-bit strings, but
-     using escaped utf-8 character codes for extended characters.
-
-     Because the 'T' symbol is occasionally used inside 3rd-party library headers which you
-     may need to include after juce.h, you can set the JUCE_DONT_DEFINE_MACROS flag to avoid
-     defining it.
+     This macro is deprecated, but available for compatibility with old code if you set
+     JUCE_DEFINE_T_MACRO = 1. The fastest, most portable and best way to write your string
+     literals is as standard char strings, using escaped utf-8 character sequences for extended
+     characters, rather than trying to store them as wide-char strings.
  */
- #define T(stringLiteral)            JUCE_T(stringLiteral)
+ #define T(stringLiteral)   JUCE_T(stringLiteral)
 #endif
 
 #undef max
diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp
index f5c1474c18..528b26b804 100644
--- a/modules/juce_events/juce_events.cpp
+++ b/modules/juce_events/juce_events.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_events.h"
 
diff --git a/modules/juce_graphics/colour/juce_Colour.cpp b/modules/juce_graphics/colour/juce_Colour.cpp
index 6bdfc2d15e..5305e2717e 100644
--- a/modules/juce_graphics/colour/juce_Colour.cpp
+++ b/modules/juce_graphics/colour/juce_Colour.cpp
@@ -28,9 +28,9 @@ BEGIN_JUCE_NAMESPACE
 //==============================================================================
 namespace ColourHelpers
 {
-    uint8 floatAlphaToInt (const float alpha) noexcept
+    uint8 floatToUInt8 (const float n) noexcept
     {
-        return (uint8) jlimit (0, 0xff, roundToInt (alpha * 255.0f));
+        return (uint8) jlimit (0, 255, roundToInt (n * 255.0f));
     }
 
     // This is an adjusted brightness value, based on the way the human eye responds to
@@ -97,63 +97,25 @@ struct HSB
         return Colour (hue, saturation, brightness, original.getAlpha());
     }
 
-    static void convertHSBtoRGB (float h, float s, float v,
-                                 uint8& r, uint8& g, uint8& b) noexcept
+    static PixelARGB convertHSBtoRGB (float h, float s, float v, const uint8 alpha) noexcept
     {
-        v = jlimit (0.0f, 1.0f, v);
-        v *= 255.0f;
+        v = jlimit (0.0f, 255.0f, v * 255.0f);
         const uint8 intV = (uint8) roundToInt (v);
 
         if (s <= 0)
-        {
-            r = intV;
-            g = intV;
-            b = intV;
-        }
-        else
-        {
-            s = jmin (1.0f, s);
-            h = (h - std::floor (h)) * 6.0f + 0.00001f; // need a small adjustment to compensate for rounding errors
-            const float f = h - std::floor (h);
-            const uint8 x = (uint8) roundToInt (v * (1.0f - s));
-
-            if (h < 1.0f)
-            {
-                r = intV;
-                g = (uint8) roundToInt (v * (1.0f - (s * (1.0f - f))));
-                b = x;
-            }
-            else if (h < 2.0f)
-            {
-                r = (uint8) roundToInt (v * (1.0f - s * f));
-                g = intV;
-                b = x;
-            }
-            else if (h < 3.0f)
-            {
-                r = x;
-                g = intV;
-                b = (uint8) roundToInt (v * (1.0f - (s * (1.0f - f))));
-            }
-            else if (h < 4.0f)
-            {
-                r = x;
-                g = (uint8) roundToInt (v * (1.0f - s * f));
-                b = intV;
-            }
-            else if (h < 5.0f)
-            {
-                r = (uint8) roundToInt (v * (1.0f - (s * (1.0f - f))));
-                g = x;
-                b = intV;
-            }
-            else
-            {
-                r = intV;
-                g = x;
-                b = (uint8) roundToInt (v * (1.0f - s * f));
-            }
-        }
+            return PixelARGB (alpha, intV, intV, intV);
+
+        s = jmin (1.0f, s);
+        h = (h - std::floor (h)) * 6.0f + 0.00001f; // need a small adjustment to compensate for rounding errors
+        const float f = h - std::floor (h);
+        const uint8 x = (uint8) roundToInt (v * (1.0f - s));
+
+        if (h < 1.0f)   return PixelARGB (alpha, intV,    (uint8) roundToInt (v * (1.0f - (s * (1.0f - f)))), x);
+        if (h < 2.0f)   return PixelARGB (alpha,          (uint8) roundToInt (v * (1.0f - s * f)), intV, x);
+        if (h < 3.0f)   return PixelARGB (alpha, x, intV, (uint8) roundToInt (v * (1.0f - (s * (1.0f - f)))));
+        if (h < 4.0f)   return PixelARGB (alpha, x,       (uint8) roundToInt (v * (1.0f - s * f)), intV);
+        if (h < 5.0f)   return PixelARGB (alpha,          (uint8) roundToInt (v * (1.0f - (s * (1.0f - f)))), x, intV);
+        else            return PixelARGB (alpha, intV, x, (uint8) roundToInt (v * (1.0f - s * f)));
     }
 
     float hue, saturation, brightness;
@@ -176,15 +138,8 @@ Colour& Colour::operator= (const Colour& other) noexcept
     return *this;
 }
 
-bool Colour::operator== (const Colour& other) const noexcept
-{
-    return argb.getARGB() == other.argb.getARGB();
-}
-
-bool Colour::operator!= (const Colour& other) const noexcept
-{
-    return argb.getARGB() != other.argb.getARGB();
-}
+bool Colour::operator== (const Colour& other) const noexcept    { return argb.getARGB() == other.argb.getARGB(); }
+bool Colour::operator!= (const Colour& other) const noexcept    { return argb.getARGB() != other.argb.getARGB(); }
 
 //==============================================================================
 Colour::Colour (const uint32 argb_) noexcept
@@ -192,80 +147,49 @@ Colour::Colour (const uint32 argb_) noexcept
 {
 }
 
-Colour::Colour (const uint8 red,
-                const uint8 green,
-                const uint8 blue) noexcept
+Colour::Colour (const uint8 red, const uint8 green, const uint8 blue) noexcept
 {
     argb.setARGB (0xff, red, green, blue);
 }
 
-Colour Colour::fromRGB (const uint8 red,
-                        const uint8 green,
-                        const uint8 blue) noexcept
+Colour Colour::fromRGB (const uint8 red, const uint8 green, const uint8 blue) noexcept
 {
     return Colour (red, green, blue);
 }
 
-Colour::Colour (const uint8 red,
-                const uint8 green,
-                const uint8 blue,
-                const uint8 alpha) noexcept
+Colour::Colour (const uint8 red, const uint8 green, const uint8 blue, const uint8 alpha) noexcept
 {
     argb.setARGB (alpha, red, green, blue);
 }
 
-Colour Colour::fromRGBA (const uint8 red,
-                         const uint8 green,
-                         const uint8 blue,
-                         const uint8 alpha) noexcept
+Colour Colour::fromRGBA (const uint8 red, const uint8 green, const uint8 blue, const uint8 alpha) noexcept
 {
     return Colour (red, green, blue, alpha);
 }
 
-Colour::Colour (const uint8 red,
-                const uint8 green,
-                const uint8 blue,
-                const float alpha) noexcept
+Colour::Colour (const uint8 red, const uint8 green, const uint8 blue, const float alpha) noexcept
 {
-    argb.setARGB (ColourHelpers::floatAlphaToInt (alpha), red, green, blue);
+    argb.setARGB (ColourHelpers::floatToUInt8 (alpha), red, green, blue);
 }
 
-Colour Colour::fromRGBAFloat (const uint8 red,
-                              const uint8 green,
-                              const uint8 blue,
-                              const float alpha) noexcept
+Colour Colour::fromRGBAFloat (const uint8 red, const uint8 green, const uint8 blue, const float alpha) noexcept
 {
     return Colour (red, green, blue, alpha);
 }
 
-Colour::Colour (const float hue,
-                const float saturation,
-                const float brightness,
-                const float alpha) noexcept
+Colour::Colour (const float hue, const float saturation, const float brightness, const float alpha) noexcept
+    : argb (HSB::convertHSBtoRGB (hue, saturation, brightness, ColourHelpers::floatToUInt8 (alpha)))
 {
-    uint8 r, g, b;
-    HSB::convertHSBtoRGB (hue, saturation, brightness, r, g, b);
-
-    argb.setARGB (ColourHelpers::floatAlphaToInt (alpha), r, g, b);
 }
 
-Colour Colour::fromHSV (const float hue,
-                        const float saturation,
-                        const float brightness,
-                        const float alpha) noexcept
+Colour Colour::fromHSV (const float hue, const float saturation, const float brightness, const float alpha) noexcept
 {
     return Colour (hue, saturation, brightness, alpha);
 }
 
-Colour::Colour (const float hue,
-                const float saturation,
-                const float brightness,
-                const uint8 alpha) noexcept
+Colour::Colour (const float hue, const float saturation, const float brightness, const uint8 alpha) noexcept
+    : argb (HSB::convertHSBtoRGB (hue, saturation, brightness, alpha))
 {
-    uint8 r, g, b;
-    HSB::convertHSBtoRGB (hue, saturation, brightness, r, g, b);
-
-    argb.setARGB (alpha, r, g, b);
 }
 
 Colour::~Colour() noexcept
@@ -308,7 +232,7 @@ Colour Colour::withAlpha (const float newAlpha) const noexcept
     jassert (newAlpha >= 0 && newAlpha <= 1.0f);
 
     PixelARGB newCol (argb);
-    newCol.setAlpha (ColourHelpers::floatAlphaToInt (newAlpha));
+    newCol.setAlpha (ColourHelpers::floatToUInt8 (newAlpha));
     return Colour (newCol.getARGB());
 }
 
@@ -326,27 +250,21 @@ Colour Colour::overlaidWith (const Colour& src) const noexcept
 {
     const int destAlpha = getAlpha();
 
-    if (destAlpha > 0)
-    {
-        const int invA = 0xff - (int) src.getAlpha();
-        const int resA = 0xff - (((0xff - destAlpha) * invA) >> 8);
+    if (destAlpha <= 0)
+        return src;
 
-        if (resA > 0)
-        {
-            const int da = (invA * destAlpha) / resA;
-
-            return Colour ((uint8) (src.getRed()   + ((((int) getRed() - src.getRed())     * da) >> 8)),
-                           (uint8) (src.getGreen() + ((((int) getGreen() - src.getGreen()) * da) >> 8)),
-                           (uint8) (src.getBlue()  + ((((int) getBlue() - src.getBlue())   * da) >> 8)),
-                           (uint8) resA);
-        }
+    const int invA = 0xff - (int) src.getAlpha();
+    const int resA = 0xff - (((0xff - destAlpha) * invA) >> 8);
 
+    if (resA <= 0)
         return *this;
-    }
-    else
-    {
-        return src;
-    }
+
+    const int da = (invA * destAlpha) / resA;
+
+    return Colour ((uint8) (src.getRed()   + ((((int) getRed()   - src.getRed())   * da) >> 8)),
+                   (uint8) (src.getGreen() + ((((int) getGreen() - src.getGreen()) * da) >> 8)),
+                   (uint8) (src.getBlue()  + ((((int) getBlue()  - src.getBlue())  * da) >> 8)),
+                   (uint8) resA);
 }
 
 Colour Colour::interpolatedWith (const Colour& other, float proportionOfOther) const noexcept
@@ -380,7 +298,6 @@ void Colour::getHSB (float& h, float& s, float& v) const noexcept
     v = hsb.brightness;
 }
 
-//==============================================================================
 float Colour::getHue() const noexcept           { return HSB (*this).hue; }
 float Colour::getSaturation() const noexcept    { return HSB (*this).saturation; }
 float Colour::getBrightness() const noexcept    { return HSB (*this).brightness; }
@@ -397,7 +314,6 @@ Colour Colour::withRotatedHue (const float amountToRotate) const noexcept
     return hsb.toColour (*this);
 }
 
-//==============================================================================
 Colour Colour::withMultipliedSaturation (const float amount) const noexcept
 {
     HSB hsb (*this);
@@ -405,14 +321,10 @@ Colour Colour::withMultipliedSaturation (const float amount) const noexcept
     return hsb.toColour (*this);
 }
 
-//==============================================================================
 Colour Colour::withMultipliedBrightness (const float amount) const noexcept
 {
     HSB hsb (*this);
-    hsb.brightness *= amount;
-    if (hsb.brightness > 1.0f)
-        hsb.brightness = 1.0f;
-
+    hsb.brightness = jmin (1.0f, hsb.brightness * amount);
     return hsb.toColour (*this);
 }
 
@@ -440,9 +352,7 @@ Colour Colour::darker (float amount) const noexcept
 //==============================================================================
 Colour Colour::greyLevel (const float brightness) noexcept
 {
-    const uint8 level
-        = (uint8) jlimit (0x00, 0xff, roundToInt (brightness * 255.0f));
-
+    const uint8 level = ColourHelpers::floatToUInt8 (brightness);
     return Colour (level, level, level);
 }
 
diff --git a/modules/juce_graphics/colour/juce_PixelFormats.h b/modules/juce_graphics/colour/juce_PixelFormats.h
index 4676fb4a74..f2ed0114c3 100644
--- a/modules/juce_graphics/colour/juce_PixelFormats.h
+++ b/modules/juce_graphics/colour/juce_PixelFormats.h
@@ -65,6 +65,14 @@ public:
     {
     }
 
+    PixelARGB (const uint8 a, const uint8 r, const uint8 g, const uint8 b) noexcept
+    {
+        components.b = b;
+        components.g = g;
+        components.r = r;
+        components.a = a;
+    }
+
     forcedinline uint32 getARGB() const noexcept                { return argb; }
     forcedinline uint32 getUnpremultipliedARGB() const noexcept { PixelARGB p (argb); p.unpremultiply(); return p.getARGB(); }
 
diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp
index e822b9696e..6b385bdf72 100644
--- a/modules/juce_graphics/juce_graphics.cpp
+++ b/modules/juce_graphics/juce_graphics.cpp
@@ -37,7 +37,6 @@
 #include "AppConfig.h"
 
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "juce_graphics.h"
 
 //==============================================================================
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index 9a6b714fb7..d4ea475251 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_gui_basics.h"
 
diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp
index 57e0dc2652..026fc309c7 100644
--- a/modules/juce_gui_extra/juce_gui_extra.cpp
+++ b/modules/juce_gui_extra/juce_gui_extra.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_gui_extra.h"
 
diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp
index 7a2bdddd31..43357276cd 100644
--- a/modules/juce_opengl/juce_opengl.cpp
+++ b/modules/juce_opengl/juce_opengl.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_opengl.h"
 
diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp
index 4dd9409613..7ad65ac961 100644
--- a/modules/juce_video/juce_video.cpp
+++ b/modules/juce_video/juce_video.cpp
@@ -36,7 +36,6 @@
 // and your header search path must make it accessible to the module's files.
 #include "AppConfig.h"
 
-#define JUCE_DONT_DEFINE_MACROS 1
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "../juce_gui_extra/juce_gui_extra.h"
 #include "juce_video.h"