diff --git a/modules/juce_core/memory/juce_HeapBlock.h b/modules/juce_core/memory/juce_HeapBlock.h
index 24e6746a2e..f2fd608d06 100644
--- a/modules/juce_core/memory/juce_HeapBlock.h
+++ b/modules/juce_core/memory/juce_HeapBlock.h
@@ -296,7 +296,7 @@ public:
     }
 
     /** This typedef can be used to get the type of the heapblock's elements. */
-    typedef ElementType Type;
+    using Type = ElementType;
 
 private:
     //==============================================================================
diff --git a/modules/juce_core/memory/juce_MemoryBlock.h b/modules/juce_core/memory/juce_MemoryBlock.h
index a245c8a003..28100edde4 100644
--- a/modules/juce_core/memory/juce_MemoryBlock.h
+++ b/modules/juce_core/memory/juce_MemoryBlock.h
@@ -252,7 +252,7 @@ public:
 
 private:
     //==============================================================================
-    typedef HeapBlock<char, true> HeapBlockType;
+    using HeapBlockType = HeapBlock<char, true>;
     HeapBlockType data;
     size_t size = 0;
 
diff --git a/modules/juce_core/memory/juce_WeakReference.h b/modules/juce_core/memory/juce_WeakReference.h
index b3d3d3f996..54db0c90a5 100644
--- a/modules/juce_core/memory/juce_WeakReference.h
+++ b/modules/juce_core/memory/juce_WeakReference.h
@@ -143,7 +143,7 @@ public:
         JUCE_DECLARE_NON_COPYABLE (SharedPointer)
     };
 
-    typedef ReferenceCountedObjectPtr<SharedPointer> SharedRef;
+    using SharedRef = ReferenceCountedObjectPtr<SharedPointer>;
 
     //==============================================================================
     /**
diff --git a/modules/juce_core/misc/juce_RuntimePermissions.h b/modules/juce_core/misc/juce_RuntimePermissions.h
index 532a0038ea..25d87fc6fd 100644
--- a/modules/juce_core/misc/juce_RuntimePermissions.h
+++ b/modules/juce_core/misc/juce_RuntimePermissions.h
@@ -91,7 +91,7 @@ public:
 
     //==============================================================================
     /** Function type of runtime permission request callbacks. */
-    typedef std::function<void (bool)> Callback;
+    using Callback = std::function<void (bool)>;
 
     //==============================================================================
     /** Call this method to request a runtime permission.
diff --git a/modules/juce_core/native/juce_osx_ObjCHelpers.h b/modules/juce_core/native/juce_osx_ObjCHelpers.h
index 30d4800786..1f0174af6a 100644
--- a/modules/juce_core/native/juce_osx_ObjCHelpers.h
+++ b/modules/juce_core/native/juce_osx_ObjCHelpers.h
@@ -211,7 +211,7 @@ static NSRect makeNSRect (const RectangleType& r) noexcept
 template <typename ReturnValue, typename... Params>
 static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Params... params)
 {
-    typedef ReturnValue (*SuperFn)(struct objc_super*, SEL, Params...);
+    using SuperFn = ReturnValue (*)(struct objc_super*, SEL, Params...);
     SuperFn fn = reinterpret_cast<SuperFn> (objc_msgSendSuper);
     return fn (s, sel, params...);
 }
diff --git a/modules/juce_core/network/juce_IPAddress.cpp b/modules/juce_core/network/juce_IPAddress.cpp
index 333208066f..29fea7043b 100644
--- a/modules/juce_core/network/juce_IPAddress.cpp
+++ b/modules/juce_core/network/juce_IPAddress.cpp
@@ -260,11 +260,11 @@ static void addAddress (const sockaddr_in6* addr_in, Array<IPAddress>& result)
 {
     in6_addr addr = addr_in->sin6_addr;
 
-    typedef union
+    union ByteUnion
     {
         uint16 combined;
         uint8 split[2];
-    } ByteUnion;
+    };
 
     ByteUnion temp;
     uint16 arr[8];
diff --git a/modules/juce_core/network/juce_IPAddress.h b/modules/juce_core/network/juce_IPAddress.h
index 49ecfde45e..bd6f543833 100644
--- a/modules/juce_core/network/juce_IPAddress.h
+++ b/modules/juce_core/network/juce_IPAddress.h
@@ -97,14 +97,14 @@ public:
 
 private:
     /** Union used to split a 16-bit unsigned integer into 2 8-bit unsigned integers or vice-versa */
-    typedef union
+    union ByteUnion
     {
         uint16 combined;
         uint8 split[2];
-    } ByteUnion;
+    };
 
     /** Method used to zero the remaining bytes of the address array when creating IPv4 addresses */
-    void zeroUnusedBytes()
+    void zeroUnusedBytes() noexcept
     {
         for (int i = 4; i < 16; ++i)
             address[i] = 0;
diff --git a/modules/juce_core/network/juce_URL.cpp b/modules/juce_core/network/juce_URL.cpp
index 75f95b7476..9cd676c748 100644
--- a/modules/juce_core/network/juce_URL.cpp
+++ b/modules/juce_core/network/juce_URL.cpp
@@ -61,10 +61,10 @@ struct FallbackDownloadTask  : public URL::DownloadTask,
             if (listener != nullptr)
                 listener->progress (this, downloaded, contentLength);
 
-            const int max = jmin ((int) bufferSize, contentLength < 0 ? std::numeric_limits<int>::max()
-                                                                      : static_cast<int> (contentLength - downloaded));
+            auto max = jmin ((int) bufferSize, contentLength < 0 ? std::numeric_limits<int>::max()
+                                                                 : static_cast<int> (contentLength - downloaded));
 
-            const int actual = stream->read (buffer.get(), max);
+            auto actual = stream->read (buffer.get(), max);
 
             if (actual < 0 || threadShouldExit() || stream->isError())
                 break;
@@ -186,8 +186,8 @@ void URL::init()
     {
         do
         {
-            const int nextAmp   = url.indexOfChar (i + 1, '&');
-            const int equalsPos = url.indexOfChar (i + 1, '=');
+            auto nextAmp   = url.indexOfChar (i + 1, '&');
+            auto equalsPos = url.indexOfChar (i + 1, '=');
 
             if (nextAmp < 0)
             {
@@ -324,7 +324,7 @@ void URL::addParameter (const String& name, const String& value)
     parameterValues.add (value);
 }
 
-String URL::toString (const bool includeGetParameters) const
+String URL::toString (bool includeGetParameters) const
 {
     if (includeGetParameters && parameterNames.size() > 0)
         return url + "?" + URLHelpers::getMangledParameters (*this);
@@ -653,14 +653,14 @@ private:
 #endif
 
 //==============================================================================
-InputStream* URL::createInputStream (const bool usePostCommand,
-                                     OpenStreamProgressCallback* const progressCallback,
-                                     void* const progressCallbackContext,
+InputStream* URL::createInputStream (bool usePostCommand,
+                                     OpenStreamProgressCallback* progressCallback,
+                                     void* progressCallbackContext,
                                      String headers,
-                                     const int timeOutMs,
-                                     StringPairArray* const responseHeaders,
+                                     int timeOutMs,
+                                     StringPairArray* responseHeaders,
                                      int* statusCode,
-                                     const int numRedirectsToFollow,
+                                     int numRedirectsToFollow,
                                      String httpRequestCmd) const
 {
     if (isLocalFile())
@@ -684,10 +684,10 @@ InputStream* URL::createInputStream (const bool usePostCommand,
 
         bool postDataSendProgress (WebInputStream&, int bytesSent, int totalBytes) override
         {
-            return callback(data, bytesSent, totalBytes);
+            return callback (data, bytesSent, totalBytes);
         }
 
-        OpenStreamProgressCallback* const callback;
+        OpenStreamProgressCallback* callback;
         void* const data;
 
         // workaround a MSVC 2013 compiler warning
@@ -858,8 +858,8 @@ String URL::removeEscapeChars (const String& s)
     {
         if (utf8.getUnchecked(i) == '%')
         {
-            const int hexDigit1 = CharacterFunctions::getHexDigitValue ((juce_wchar) (uint8) utf8 [i + 1]);
-            const int hexDigit2 = CharacterFunctions::getHexDigitValue ((juce_wchar) (uint8) utf8 [i + 2]);
+            auto hexDigit1 = CharacterFunctions::getHexDigitValue ((juce_wchar) (uint8) utf8 [i + 1]);
+            auto hexDigit2 = CharacterFunctions::getHexDigitValue ((juce_wchar) (uint8) utf8 [i + 2]);
 
             if (hexDigit1 >= 0 && hexDigit2 >= 0)
             {
diff --git a/modules/juce_core/network/juce_URL.h b/modules/juce_core/network/juce_URL.h
index 81997f037e..784de7a590 100644
--- a/modules/juce_core/network/juce_URL.h
+++ b/modules/juce_core/network/juce_URL.h
@@ -284,7 +284,7 @@ public:
         It allows your app to receive progress updates during a lengthy POST operation. If you
         want to continue the operation, this should return true, or false to abort.
     */
-    typedef bool (OpenStreamProgressCallback) (void* context, int bytesSent, int totalBytes);
+    using OpenStreamProgressCallback = bool (void* context, int bytesSent, int totalBytes);
 
     /** Attempts to open a stream that can read from this URL.
 
diff --git a/modules/juce_core/system/juce_SystemStats.h b/modules/juce_core/system/juce_SystemStats.h
index f804a62c01..30894dc449 100644
--- a/modules/juce_core/system/juce_SystemStats.h
+++ b/modules/juce_core/system/juce_SystemStats.h
@@ -202,7 +202,7 @@ public:
     /** A function type for use in setApplicationCrashHandler(). The parameter will contain
         platform-specific data about the crash.
     */
-    typedef void (*CrashHandlerFunction) (void*);
+    using CrashHandlerFunction = void (*) (void*);
 
     /** Sets up a global callback function that will be called if the application
         executes some kind of illegal instruction.
diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp
index 5b52e8e4b7..123e8418a3 100644
--- a/modules/juce_core/text/juce_String.cpp
+++ b/modules/juce_core/text/juce_String.cpp
@@ -2047,7 +2047,7 @@ struct StringEncodingConverter
     {
         auto& source = const_cast<String&> (s);
 
-        typedef typename CharPointerType_Dest::CharType DestChar;
+        using DestChar = typename CharPointerType_Dest::CharType;
 
         if (source.isEmpty())
             return CharPointerType_Dest (reinterpret_cast<const DestChar*> (&emptyChar));
diff --git a/modules/juce_core/text/juce_String.h b/modules/juce_core/text/juce_String.h
index 13686eb0d6..13e8c04e59 100644
--- a/modules/juce_core/text/juce_String.h
+++ b/modules/juce_core/text/juce_String.h
@@ -153,11 +153,11 @@ public:
         toUTF32() methods let you access the string's content in any of the other formats.
     */
    #if (JUCE_STRING_UTF_TYPE == 32)
-    typedef CharPointer_UTF32 CharPointerType;
+    using CharPointerType = CharPointer_UTF32;
    #elif (JUCE_STRING_UTF_TYPE == 16)
-    typedef CharPointer_UTF16 CharPointerType;
+    using CharPointerType = CharPointer_UTF16;
    #elif (DOXYGEN || JUCE_STRING_UTF_TYPE == 8)
-    typedef CharPointer_UTF8  CharPointerType;
+    using CharPointerType = CharPointer_UTF8;
    #else
     #error "You must set the value of JUCE_STRING_UTF_TYPE to be either 8, 16, or 32!"
    #endif
diff --git a/modules/juce_core/threads/juce_CriticalSection.h b/modules/juce_core/threads/juce_CriticalSection.h
index 70b75304eb..b7e3de561a 100644
--- a/modules/juce_core/threads/juce_CriticalSection.h
+++ b/modules/juce_core/threads/juce_CriticalSection.h
@@ -90,13 +90,13 @@ public:
 
     //==============================================================================
     /** Provides the type of scoped lock to use with a CriticalSection. */
-    typedef GenericScopedLock <CriticalSection>       ScopedLockType;
+    using ScopedLockType = GenericScopedLock<CriticalSection>;
 
     /** Provides the type of scoped unlocker to use with a CriticalSection. */
-    typedef GenericScopedUnlock <CriticalSection>     ScopedUnlockType;
+    using ScopedUnlockType = GenericScopedUnlock<CriticalSection>;
 
     /** Provides the type of scoped try-locker to use with a CriticalSection. */
-    typedef GenericScopedTryLock <CriticalSection>    ScopedTryLockType;
+    using ScopedTryLockType = GenericScopedTryLock<CriticalSection>;
 
 
 private:
@@ -148,7 +148,7 @@ public:
     };
 
     /** A dummy scoped-unlocker type to use with a dummy critical section. */
-    typedef ScopedLockType ScopedUnlockType;
+    using ScopedUnlockType = ScopedLockType;
 
 private:
     JUCE_DECLARE_NON_COPYABLE (DummyCriticalSection)
diff --git a/modules/juce_core/threads/juce_SpinLock.h b/modules/juce_core/threads/juce_SpinLock.h
index 88e008bbbc..78fd713b5a 100644
--- a/modules/juce_core/threads/juce_SpinLock.h
+++ b/modules/juce_core/threads/juce_SpinLock.h
@@ -70,10 +70,10 @@ public:
 
     //==============================================================================
     /** Provides the type of scoped lock to use for locking a SpinLock. */
-    typedef GenericScopedLock <SpinLock>       ScopedLockType;
+    using ScopedLockType = GenericScopedLock<SpinLock>;
 
     /** Provides the type of scoped unlocker to use with a SpinLock. */
-    typedef GenericScopedUnlock <SpinLock>     ScopedUnlockType;
+    using ScopedUnlockType = GenericScopedUnlock<SpinLock>;
 
 private:
     //==============================================================================
diff --git a/modules/juce_core/threads/juce_Thread.h b/modules/juce_core/threads/juce_Thread.h
index 373dc1b06a..158860c07e 100644
--- a/modules/juce_core/threads/juce_Thread.h
+++ b/modules/juce_core/threads/juce_Thread.h
@@ -288,7 +288,7 @@ public:
     /** A value type used for thread IDs.
         @see getCurrentThreadId(), getThreadId()
     */
-    typedef void* ThreadID;
+    using ThreadID = void*;
 
     /** Returns an id that identifies the caller thread.
 
diff --git a/modules/juce_core/time/juce_Time.cpp b/modules/juce_core/time/juce_Time.cpp
index ce49f302d0..2f3107ecd1 100644
--- a/modules/juce_core/time/juce_Time.cpp
+++ b/modules/juce_core/time/juce_Time.cpp
@@ -94,11 +94,11 @@ namespace TimeHelpers
     static inline String formatString (const String& format, const std::tm* const tm)
     {
        #if JUCE_ANDROID
-        typedef CharPointer_UTF8  StringType;
+        using StringType = CharPointer_UTF8;
        #elif JUCE_WINDOWS
-        typedef CharPointer_UTF16 StringType;
+        using StringType = CharPointer_UTF16;
        #else
-        typedef CharPointer_UTF32 StringType;
+        using StringType = CharPointer_UTF32;
        #endif
 
        #ifdef JUCE_MSVC
diff --git a/modules/juce_events/messages/juce_ApplicationBase.h b/modules/juce_events/messages/juce_ApplicationBase.h
index 6d0f9c562f..bb083585b5 100644
--- a/modules/juce_events/messages/juce_ApplicationBase.h
+++ b/modules/juce_events/messages/juce_ApplicationBase.h
@@ -270,7 +270,7 @@ public:
     static int main (int argc, const char* argv[]);
 
     static void appWillTerminateByForce();
-    typedef JUCEApplicationBase* (*CreateInstanceFunction)();
+    using CreateInstanceFunction = JUCEApplicationBase* (*)();
     static CreateInstanceFunction createInstance;
 
    #if JUCE_IOS
diff --git a/modules/juce_events/messages/juce_MessageManager.h b/modules/juce_events/messages/juce_MessageManager.h
index 345b80349e..669c441d4b 100644
--- a/modules/juce_events/messages/juce_MessageManager.h
+++ b/modules/juce_events/messages/juce_MessageManager.h
@@ -280,13 +280,13 @@ public:
 
         //==============================================================================
         /** Provides the type of scoped lock to use with a CriticalSection. */
-        typedef GenericScopedLock<Lock>       ScopedLockType;
+        using ScopedLockType = GenericScopedLock<Lock>;
 
         /** Provides the type of scoped unlocker to use with a CriticalSection. */
-        typedef GenericScopedUnlock<Lock>     ScopedUnlockType;
+        using ScopedUnlockType = GenericScopedUnlock<Lock>;
 
         /** Provides the type of scoped try-locker to use with a CriticalSection. */
-        typedef GenericScopedTryLock<Lock>    ScopedTryLockType;
+        using ScopedTryLockType = GenericScopedTryLock<Lock>;
 
     private:
         struct BlockingMessage;
diff --git a/modules/juce_events/timers/juce_Timer.cpp b/modules/juce_events/timers/juce_Timer.cpp
index 1d724cd9a6..f2e280d1e6 100644
--- a/modules/juce_events/timers/juce_Timer.cpp
+++ b/modules/juce_events/timers/juce_Timer.cpp
@@ -28,7 +28,7 @@ class Timer::TimerThread  : private Thread,
                             private AsyncUpdater
 {
 public:
-    typedef CriticalSection LockType; // (mysteriously, using a SpinLock here causes problems on some XP machines..)
+    using LockType = CriticalSection; // (mysteriously, using a SpinLock here causes problems on some XP machines..)
 
     TimerThread()  : Thread ("JUCE Timer")
     {
diff --git a/modules/juce_graphics/geometry/juce_Point.h b/modules/juce_graphics/geometry/juce_Point.h
index e025f8b6db..15bef89a71 100644
--- a/modules/juce_graphics/geometry/juce_Point.h
+++ b/modules/juce_graphics/geometry/juce_Point.h
@@ -141,7 +141,7 @@ public:
 
     //==============================================================================
     /** This type will be double if the Point's type is double, otherwise it will be float. */
-    typedef typename TypeHelpers::SmallestFloatType<ValueType>::type FloatType;
+    using FloatType = typename TypeHelpers::SmallestFloatType<ValueType>::type;
 
     //==============================================================================
     /** Returns the straight-line distance between this point and the origin. */
diff --git a/modules/juce_graphics/geometry/juce_RectangleList.h b/modules/juce_graphics/geometry/juce_RectangleList.h
index 22091f9b10..531b502420 100644
--- a/modules/juce_graphics/geometry/juce_RectangleList.h
+++ b/modules/juce_graphics/geometry/juce_RectangleList.h
@@ -43,7 +43,7 @@ template <typename ValueType>
 class RectangleList  final
 {
 public:
-    typedef Rectangle<ValueType> RectangleType;
+    using RectangleType = Rectangle<ValueType>;
 
     //==============================================================================
     /** Creates an empty RectangleList */
diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp
index 197839dda4..82c8bd05ff 100644
--- a/modules/juce_graphics/images/juce_Image.cpp
+++ b/modules/juce_graphics/images/juce_Image.cpp
@@ -27,7 +27,7 @@
 namespace juce
 {
 
-ImagePixelData::ImagePixelData (const Image::PixelFormat format, const int w, const int h)
+ImagePixelData::ImagePixelData (Image::PixelFormat format, int w, int h)
     : pixelFormat (format), width (w), height (h)
 {
     jassert (format == Image::RGB || format == Image::ARGB || format == Image::SingleChannel);
@@ -82,9 +82,9 @@ Image ImageType::convert (const Image& source) const
 class SoftwarePixelData  : public ImagePixelData
 {
 public:
-    SoftwarePixelData (const Image::PixelFormat format_, const int w, const int h, const bool clearImage)
-        : ImagePixelData (format_, w, h),
-          pixelStride (format_ == Image::RGB ? 3 : ((format_ == Image::ARGB) ? 4 : 1)),
+    SoftwarePixelData (Image::PixelFormat formatToUse, int w, int h, bool clearImage)
+        : ImagePixelData (formatToUse, w, h),
+          pixelStride (formatToUse == Image::RGB ? 3 : ((formatToUse == Image::ARGB) ? 4 : 1)),
           lineStride ((pixelStride * jmax (1, w) + 3) & ~3)
     {
         imageData.allocate ((size_t) lineStride * (size_t) jmax (1, h), clearImage);
@@ -156,7 +156,7 @@ ImagePixelData::Ptr NativeImageType::create (Image::PixelFormat format, int widt
 class SubsectionPixelData  : public ImagePixelData
 {
 public:
-    SubsectionPixelData (ImagePixelData* const im, const Rectangle<int>& r)
+    SubsectionPixelData (ImagePixelData* im, Rectangle<int> r)
         : ImagePixelData (im->pixelFormat, r.getWidth(), r.getHeight()),
           sourceImage (im), area (r)
     {
@@ -211,8 +211,12 @@ Image Image::getClippedImage (const Rectangle<int>& area) const
     if (area.contains (getBounds()))
         return *this;
 
-    const Rectangle<int> validArea (area.getIntersection (getBounds()));
-    return Image (validArea.isEmpty() ? nullptr : new SubsectionPixelData (image, validArea));
+    auto validArea = area.getIntersection (getBounds());
+
+    if (validArea.isEmpty())
+        return {};
+
+    return Image (new SubsectionPixelData (image, validArea));
 }
 
 
@@ -221,17 +225,17 @@ Image::Image() noexcept
 {
 }
 
-Image::Image (ImagePixelData* const instance) noexcept
+Image::Image (ImagePixelData* instance) noexcept
     : image (instance)
 {
 }
 
-Image::Image (const PixelFormat format, int width, int height, bool clearImage)
+Image::Image (PixelFormat format, int width, int height, bool clearImage)
     : image (NativeImageType().create (format, width, height, clearImage))
 {
 }
 
-Image::Image (const PixelFormat format, int width, int height, bool clearImage, const ImageType& type)
+Image::Image (PixelFormat format, int width, int height, bool clearImage, const ImageType& type)
     : image (type.create (format, width, height, clearImage))
 {
 }
@@ -290,10 +294,10 @@ Image Image::createCopy() const
     if (image != nullptr)
         return Image (image->clone());
 
-    return Image();
+    return {};
 }
 
-Image Image::rescaled (const int newWidth, const int newHeight, const Graphics::ResamplingQuality quality) const
+Image Image::rescaled (int newWidth, int newHeight, Graphics::ResamplingQuality quality) const
 {
     if (image == nullptr || (image->width == newWidth && image->height == newHeight))
         return *this;
@@ -313,7 +317,7 @@ Image Image::convertedToFormat (PixelFormat newFormat) const
     if (image == nullptr || newFormat == image->pixelFormat)
         return *this;
 
-    const int w = image->width, h = image->height;
+    auto w = image->width, h = image->height;
 
     const std::unique_ptr<ImageType> type (image->createType());
     Image newImage (type->create (newFormat, w, h, false));
@@ -331,8 +335,8 @@ Image Image::convertedToFormat (PixelFormat newFormat) const
 
             for (int y = 0; y < h; ++y)
             {
-                const PixelARGB* const src = (const PixelARGB*) srcData.getLinePointer (y);
-                uint8* const dst = destData.getLinePointer (y);
+                auto src = reinterpret_cast<const PixelARGB*> (srcData.getLinePointer (y));
+                auto dst = destData.getLinePointer (y);
 
                 for (int x = 0; x < w; ++x)
                     dst[x] = src[x].getAlpha();
@@ -346,8 +350,8 @@ Image Image::convertedToFormat (PixelFormat newFormat) const
 
         for (int y = 0; y < h; ++y)
         {
-            const PixelAlpha* const src = (const PixelAlpha*) srcData.getLinePointer (y);
-            PixelARGB* const dst = (PixelARGB*) destData.getLinePointer (y);
+            auto src = reinterpret_cast<const PixelAlpha*> (srcData.getLinePointer (y));
+            auto dst = reinterpret_cast<PixelARGB*> (destData.getLinePointer (y));
 
             for (int x = 0; x < w; ++x)
                 dst[x].set (src[x]);
@@ -371,7 +375,7 @@ NamedValueSet* Image::getProperties() const
 }
 
 //==============================================================================
-Image::BitmapData::BitmapData (Image& im, const int x, const int y, const int w, const int h, BitmapData::ReadWriteMode mode)
+Image::BitmapData::BitmapData (Image& im, int x, int y, int w, int h, BitmapData::ReadWriteMode mode)
     : width (w), height (h)
 {
     // The BitmapData class must be given a valid image, and a valid rectangle within it!
@@ -382,7 +386,7 @@ Image::BitmapData::BitmapData (Image& im, const int x, const int y, const int w,
     jassert (data != nullptr && pixelStride > 0 && lineStride != 0);
 }
 
-Image::BitmapData::BitmapData (const Image& im, const int x, const int y, const int w, const int h)
+Image::BitmapData::BitmapData (const Image& im, int x, int y, int w, int h)
     : width (w), height (h)
 {
     // The BitmapData class must be given a valid image, and a valid rectangle within it!
@@ -408,11 +412,11 @@ Image::BitmapData::~BitmapData()
 {
 }
 
-Colour Image::BitmapData::getPixelColour (const int x, const int y) const noexcept
+Colour Image::BitmapData::getPixelColour (int x, int y) const noexcept
 {
     jassert (isPositiveAndBelow (x, width) && isPositiveAndBelow (y, height));
 
-    const uint8* const pixel = getPixelPointer (x, y);
+    auto pixel = getPixelPointer (x, y);
 
     switch (pixelFormat)
     {
@@ -422,15 +426,15 @@ Colour Image::BitmapData::getPixelColour (const int x, const int y) const noexce
         default:                    jassertfalse; break;
     }
 
-    return Colour();
+    return {};
 }
 
-void Image::BitmapData::setPixelColour (const int x, const int y, Colour colour) const noexcept
+void Image::BitmapData::setPixelColour (int x, int y, Colour colour) const noexcept
 {
     jassert (isPositiveAndBelow (x, width) && isPositiveAndBelow (y, height));
 
-    uint8* const pixel = getPixelPointer (x, y);
-    const PixelARGB col (colour.getPixelARGB());
+    auto pixel = getPixelPointer (x, y);
+    auto col = colour.getPixelARGB();
 
     switch (pixelFormat)
     {
@@ -453,7 +457,7 @@ void Image::clear (const Rectangle<int>& area, Colour colourToClearTo)
 }
 
 //==============================================================================
-Colour Image::getPixelAt (const int x, const int y) const
+Colour Image::getPixelAt (int x, int y) const
 {
     if (isPositiveAndBelow (x, getWidth()) && isPositiveAndBelow (y, getHeight()))
     {
@@ -461,10 +465,10 @@ Colour Image::getPixelAt (const int x, const int y) const
         return srcData.getPixelColour (0, 0);
     }
 
-    return Colour();
+    return {};
 }
 
-void Image::setPixelAt (const int x, const int y, Colour colour)
+void Image::setPixelAt (int x, int y, Colour colour)
 {
     if (isPositiveAndBelow (x, getWidth()) && isPositiveAndBelow (y, getHeight()))
     {
@@ -473,7 +477,7 @@ void Image::setPixelAt (const int x, const int y, Colour colour)
     }
 }
 
-void Image::multiplyAlphaAt (const int x, const int y, const float multiplier)
+void Image::multiplyAlphaAt (int x, int y, float multiplier)
 {
     if (isPositiveAndBelow (x, getWidth()) && isPositiveAndBelow (y, getHeight())
          && hasAlphaChannel())
@@ -481,7 +485,7 @@ void Image::multiplyAlphaAt (const int x, const int y, const float multiplier)
         const BitmapData destData (*this, x, y, 1, 1, BitmapData::readWrite);
 
         if (isARGB())
-            ((PixelARGB*) destData.data)->multiplyAlpha (multiplier);
+            reinterpret_cast<PixelARGB*> (destData.data)->multiplyAlpha (multiplier);
         else
             *(destData.data) = (uint8) (*(destData.data) * multiplier);
     }
@@ -495,11 +499,11 @@ struct PixelIterator
     {
         for (int y = 0; y < data.height; ++y)
         {
-            uint8* p = data.getLinePointer (y);
+            auto p = data.getLinePointer (y);
 
             for (int x = 0; x < data.width; ++x)
             {
-                pixelOp (*(PixelType*) p);
+                pixelOp (*reinterpret_cast<PixelType*> (p));
                 p += data.pixelStride;
             }
         }
@@ -529,7 +533,7 @@ struct AlphaMultiplyOp
     }
 };
 
-void Image::multiplyAllAlphas (const float amountToMultiplyBy)
+void Image::multiplyAllAlphas (float amountToMultiplyBy)
 {
     jassert (hasAlphaChannel());
 
@@ -555,11 +559,11 @@ void Image::desaturate()
     }
 }
 
-void Image::createSolidAreaMask (RectangleList<int>& result, const float alphaThreshold) const
+void Image::createSolidAreaMask (RectangleList<int>& result, float alphaThreshold) const
 {
     if (hasAlphaChannel())
     {
-        const uint8 threshold = (uint8) jlimit (0, 255, roundToInt (alphaThreshold * 255.0f));
+        auto threshold = (uint8) jlimit (0, 255, roundToInt (alphaThreshold * 255.0f));
         SparseSet<int> pixelsOnRow;
 
         const BitmapData srcData (*this, 0, 0, getWidth(), getHeight());
@@ -567,13 +571,13 @@ void Image::createSolidAreaMask (RectangleList<int>& result, const float alphaTh
         for (int y = 0; y < srcData.height; ++y)
         {
             pixelsOnRow.clear();
-            const uint8* lineData = srcData.getLinePointer (y);
+            auto lineData = srcData.getLinePointer (y);
 
             if (isARGB())
             {
                 for (int x = 0; x < srcData.width; ++x)
                 {
-                    if (((const PixelARGB*) lineData)->getAlpha() >= threshold)
+                    if (reinterpret_cast<const PixelARGB*> (lineData)->getAlpha() >= threshold)
                         pixelsOnRow.addRange (Range<int> (x, x + 1));
 
                     lineData += srcData.pixelStride;
@@ -592,7 +596,7 @@ void Image::createSolidAreaMask (RectangleList<int>& result, const float alphaTh
 
             for (int i = 0; i < pixelsOnRow.getNumRanges(); ++i)
             {
-                const Range<int> range (pixelsOnRow.getRange (i));
+                auto range = pixelsOnRow.getRange (i);
                 result.add (Rectangle<int> (range.getStart(), y, range.getLength(), 1));
             }
 
@@ -645,15 +649,15 @@ void Image::moveImageSection (int dx, int dy,
 
     if (w > 0 && h > 0)
     {
-        const int maxX = jmax (dx, sx) + w;
-        const int maxY = jmax (dy, sy) + h;
+        auto maxX = jmax (dx, sx) + w;
+        auto maxY = jmax (dy, sy) + h;
 
         const BitmapData destData (*this, minX, minY, maxX - minX, maxY - minY, BitmapData::readWrite);
 
-        uint8* dst       = destData.getPixelPointer (dx - minX, dy - minY);
-        const uint8* src = destData.getPixelPointer (sx - minX, sy - minY);
+        auto dst = destData.getPixelPointer (dx - minX, dy - minY);
+        auto src = destData.getPixelPointer (sx - minX, sy - minY);
 
-        const size_t lineSize = (size_t) (destData.pixelStride * w);
+        auto lineSize = (size_t) (destData.pixelStride * w);
 
         if (dy > sy)
         {
diff --git a/modules/juce_graphics/native/juce_freetype_Fonts.cpp b/modules/juce_graphics/native/juce_freetype_Fonts.cpp
index 367d3b26bc..a041d221fa 100644
--- a/modules/juce_graphics/native/juce_freetype_Fonts.cpp
+++ b/modules/juce_graphics/native/juce_freetype_Fonts.cpp
@@ -27,13 +27,13 @@
 namespace juce
 {
 
-struct FTLibWrapper     : public ReferenceCountedObject
+struct FTLibWrapper  : public ReferenceCountedObject
 {
-    FTLibWrapper() : library (0)
+    FTLibWrapper()
     {
         if (FT_Init_FreeType (&library) != 0)
         {
-            library = 0;
+            library = {};
             DBG ("Failed to initialize FreeType");
         }
     }
@@ -44,7 +44,7 @@ struct FTLibWrapper     : public ReferenceCountedObject
             FT_Done_FreeType (library);
     }
 
-    FT_Library library;
+    FT_Library library = {};
 
     using Ptr = ReferenceCountedObjectPtr<FTLibWrapper>;
 
@@ -55,18 +55,18 @@ struct FTLibWrapper     : public ReferenceCountedObject
 struct FTFaceWrapper     : public ReferenceCountedObject
 {
     FTFaceWrapper (const FTLibWrapper::Ptr& ftLib, const File& file, int faceIndex)
-        : face (0), library (ftLib)
+        : library (ftLib)
     {
         if (FT_New_Face (ftLib->library, file.getFullPathName().toUTF8(), faceIndex, &face) != 0)
-            face = 0;
+            face = {};
     }
 
     FTFaceWrapper (const FTLibWrapper::Ptr& ftLib, const void* data, size_t dataSize, int faceIndex)
-        : face (0), library (ftLib), savedFaceData (data, dataSize)
+        : library (ftLib), savedFaceData (data, dataSize)
     {
         if (FT_New_Memory_Face (ftLib->library, (const FT_Byte*) savedFaceData.getData(),
                                 (FT_Long) savedFaceData.getSize(), faceIndex, &face) != 0)
-            face = 0;
+            face = {};
     }
 
     ~FTFaceWrapper()
@@ -75,7 +75,7 @@ struct FTFaceWrapper     : public ReferenceCountedObject
             FT_Done_Face (face);
     }
 
-    FT_Face face;
+    FT_Face face = {};
     FTLibWrapper::Ptr library;
     MemoryBlock savedFaceData;
 
@@ -101,7 +101,7 @@ public:
     //==============================================================================
     struct KnownTypeface
     {
-        KnownTypeface (const File& f, const int index, const FTFaceWrapper& face)
+        KnownTypeface (const File& f, int index, const FTFaceWrapper& face)
            : file (f),
              family (face.face->family_name),
              style (face.face->style_name),
@@ -141,10 +141,10 @@ public:
 
     FTFaceWrapper::Ptr createFace (const String& fontName, const String& fontStyle)
     {
-        const KnownTypeface* ftFace = matchTypeface (fontName, fontStyle);
+        auto ftFace = matchTypeface (fontName, fontStyle);
 
         if (ftFace == nullptr)  ftFace = matchTypeface (fontName, "Regular");
-        if (ftFace == nullptr)  ftFace = matchTypeface (fontName, String());
+        if (ftFace == nullptr)  ftFace = matchTypeface (fontName, {});
 
         if (ftFace != nullptr)
             return createFace (ftFace->file, ftFace->faceIndex);
@@ -157,8 +157,8 @@ public:
     {
         StringArray s;
 
-        for (int i = 0; i < faces.size(); ++i)
-            s.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
+        for (auto* face : faces)
+            s.addIfNotAlreadyThere (face->family);
 
         return s;
     }
@@ -167,28 +167,27 @@ public:
     {
         int i = styles.indexOf ("Regular", true);
 
-        if (i < 0)
-            for (i = 0; i < styles.size(); ++i)
-                if (! (styles[i].containsIgnoreCase ("Bold") || styles[i].containsIgnoreCase ("Italic")))
-                    break;
+        if (i >= 0)
+            return i;
 
-        return i;
+        for (i = 0; i < styles.size(); ++i)
+            if (! (styles[i].containsIgnoreCase ("Bold") || styles[i].containsIgnoreCase ("Italic")))
+                return i;
+
+        return -1;
     }
 
     StringArray findAllTypefaceStyles (const String& family) const
     {
         StringArray s;
 
-        for (int i = 0; i < faces.size(); ++i)
-        {
-            const KnownTypeface* const face = faces.getUnchecked(i);
-
+        for (auto* face : faces)
             if (face->family == family)
                 s.addIfNotAlreadyThere (face->style);
-        }
 
         // try to get a regular style to be first in the list
-        const int regular = indexOfRegularStyle (s);
+        auto regular = indexOfRegularStyle (s);
+
         if (regular > 0)
             s.strings.swap (0, regular);
 
@@ -197,10 +196,9 @@ public:
 
     void scanFontPaths (const StringArray& paths)
     {
-        for (int i = 0; i < paths.size(); ++i)
+        for (auto& path : paths)
         {
-            DirectoryIterator iter (File::getCurrentWorkingDirectory()
-                                       .getChildFile (paths[i]), true);
+            DirectoryIterator iter (File::getCurrentWorkingDirectory().getChildFile (path), true);
 
             while (iter.next())
                 if (iter.getFile().hasFileExtension ("ttf;pfb;pcf;otf"))
@@ -210,23 +208,23 @@ public:
 
     void getMonospacedNames (StringArray& monoSpaced) const
     {
-        for (int i = 0; i < faces.size(); ++i)
-            if (faces.getUnchecked(i)->isMonospaced)
-                monoSpaced.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
+        for (auto* face : faces)
+            if (face->isMonospaced)
+                monoSpaced.addIfNotAlreadyThere (face->family);
     }
 
     void getSerifNames (StringArray& serif) const
     {
-        for (int i = 0; i < faces.size(); ++i)
-            if (! faces.getUnchecked(i)->isSansSerif)
-                serif.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
+        for (auto* face : faces)
+            if (! (face->isSansSerif || face->isMonospaced))
+                serif.addIfNotAlreadyThere (face->family);
     }
 
     void getSansSerifNames (StringArray& sansSerif) const
     {
-        for (int i = 0; i < faces.size(); ++i)
-            if (faces.getUnchecked(i)->isSansSerif)
-                sansSerif.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
+        for (auto* face : faces)
+            if (face->isSansSerif)
+                sansSerif.addIfNotAlreadyThere (face->family);
     }
 
     JUCE_DECLARE_SINGLETON_SINGLETHREADED_MINIMAL (FTTypefaceList)
@@ -262,14 +260,10 @@ private:
 
     const KnownTypeface* matchTypeface (const String& familyName, const String& style) const noexcept
     {
-        for (int i = 0; i < faces.size(); ++i)
-        {
-            const KnownTypeface* const face = faces.getUnchecked(i);
-
+        for (auto* face : faces)
             if (face->family == familyName
                   && (face->style.equalsIgnoreCase (style) || style.isEmpty()))
                 return face;
-        }
 
         return nullptr;
     }
@@ -278,8 +272,8 @@ private:
     {
         static const char* sansNames[] = { "Sans", "Verdana", "Arial", "Ubuntu" };
 
-        for (int i = 0; i < numElementsInArray (sansNames); ++i)
-            if (family.containsIgnoreCase (sansNames[i]))
+        for (auto* name : sansNames)
+            if (family.containsIgnoreCase (name))
                 return true;
 
         return false;
@@ -323,13 +317,13 @@ public:
     {
         if (faceWrapper != nullptr)
         {
-            FT_Face face = faceWrapper->face;
-            const unsigned int glyphIndex = FT_Get_Char_Index (face, (FT_ULong) character);
+            auto face = faceWrapper->face;
+            auto glyphIndex = FT_Get_Char_Index (face, (FT_ULong) character);
 
             if (FT_Load_Glyph (face, glyphIndex, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_TRANSFORM | FT_LOAD_NO_HINTING) == 0
                   && face->glyph->format == ft_glyph_format_outline)
             {
-                const float scale = 1.0f / (float) (face->ascender - face->descender);
+                auto scale = 1.0f / (float) (face->ascender - face->descender);
                 Path destShape;
 
                 if (getGlyphShape (destShape, face->glyph->outline, scale))
@@ -350,12 +344,12 @@ public:
 private:
     FTFaceWrapper::Ptr faceWrapper;
 
-    bool getGlyphShape (Path& destShape, const FT_Outline& outline, const float scaleX)
+    bool getGlyphShape (Path& destShape, const FT_Outline& outline, float scaleX)
     {
-        const float scaleY = -scaleX;
-        const short* const contours = outline.contours;
-        const char* const tags = outline.tags;
-        const FT_Vector* const points = outline.points;
+        auto scaleY = -scaleX;
+        auto* contours = outline.contours;
+        auto* tags = outline.tags;
+        auto* points = outline.points;
 
         for (int c = 0; c < outline.n_contours; ++c)
         {
@@ -364,15 +358,15 @@ private:
 
             for (int p = startPoint; p <= endPoint; ++p)
             {
-                const float x = scaleX * points[p].x;
-                const float y = scaleY * points[p].y;
+                auto x = scaleX * points[p].x;
+                auto y = scaleY * points[p].y;
 
                 if (p == startPoint)
                 {
                     if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic)
                     {
-                        float x2 = scaleX * points [endPoint].x;
-                        float y2 = scaleY * points [endPoint].y;
+                        auto x2 = scaleX * points [endPoint].x;
+                        auto y2 = scaleY * points [endPoint].y;
 
                         if (FT_CURVE_TAG (tags[endPoint]) != FT_Curve_Tag_On)
                         {
@@ -396,8 +390,8 @@ private:
                 else if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic)
                 {
                     const int nextIndex = (p == endPoint) ? startPoint : p + 1;
-                    float x2 = scaleX * points [nextIndex].x;
-                    float y2 = scaleY * points [nextIndex].y;
+                    auto x2 = scaleX * points [nextIndex].x;
+                    auto y2 = scaleY * points [nextIndex].y;
 
                     if (FT_CURVE_TAG (tags [nextIndex]) == FT_Curve_Tag_Conic)
                     {
@@ -421,10 +415,10 @@ private:
                          || FT_CURVE_TAG (tags[next2]) != FT_Curve_Tag_On)
                         return false;
 
-                    const float x2 = scaleX * points [next1].x;
-                    const float y2 = scaleY * points [next1].y;
-                    const float x3 = scaleX * points [next2].x;
-                    const float y3 = scaleY * points [next2].y;
+                    auto x2 = scaleX * points [next1].x;
+                    auto y2 = scaleY * points [next1].y;
+                    auto x3 = scaleX * points [next2].x;
+                    auto y3 = scaleY * points [next2].y;
 
                     destShape.cubicTo (x, y, x2, y2, x3, y3);
                     p += 2;
@@ -439,10 +433,10 @@ private:
 
     void addKerning (FT_Face face, const uint32 character, const uint32 glyphIndex)
     {
-        const float height = (float) (face->ascender - face->descender);
+        auto height = (float) (face->ascender - face->descender);
 
         uint32 rightGlyphIndex;
-        FT_ULong rightCharCode = FT_Get_First_Char (face, &rightGlyphIndex);
+        auto rightCharCode = FT_Get_First_Char (face, &rightGlyphIndex);
 
         while (rightGlyphIndex != 0)
         {
diff --git a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
index b9f7d592ff..75a58b90d8 100644
--- a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
+++ b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
@@ -761,7 +761,7 @@ void Direct2DLowLevelGraphicsContext::drawImage (const Image& image, const Affin
     pimpl->renderingTarget->SetTransform (D2D1::IdentityMatrix());
 }
 
-void Direct2DLowLevelGraphicsContext::drawLine (const Line <float>& line)
+void Direct2DLowLevelGraphicsContext::drawLine (const Line<float>& line)
 {
     // xxx doesn't seem to be correctly aligned, may need nudging by 0.5 to match the software renderer's behaviour
     pimpl->renderingTarget->SetTransform (transformToMatrix (currentState->transform));
diff --git a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
index d007ebb6bc..ae2e284fc1 100644
--- a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
+++ b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
@@ -36,9 +36,7 @@ namespace DirectWriteTypeLayout
         CustomDirectWriteTextRenderer (IDWriteFontCollection& fonts, const AttributedString& as)
             : ComBaseClassHelper<IDWriteTextRenderer> (0),
               attributedString (as),
-              fontCollection (fonts),
-              currentLine (-1),
-              lastOriginY (-10000.0f)
+              fontCollection (fonts)
         {
         }
 
@@ -89,7 +87,7 @@ namespace DirectWriteTypeLayout
                                      DWRITE_GLYPH_RUN const* glyphRun, DWRITE_GLYPH_RUN_DESCRIPTION const* runDescription,
                                      IUnknown* clientDrawingEffect) override
         {
-            TextLayout* const layout = static_cast<TextLayout*> (clientDrawingContext);
+            auto layout = static_cast<TextLayout*> (clientDrawingContext);
 
             if (! (baselineOriginY >= -1.0e10f && baselineOriginY <= 1.0e10f))
                 baselineOriginY = 0; // DirectWrite sometimes sends NaNs in this parameter
@@ -102,14 +100,14 @@ namespace DirectWriteTypeLayout
                 if (currentLine >= layout->getNumLines())
                 {
                     jassert (currentLine == layout->getNumLines());
-                    TextLayout::Line* const line = new TextLayout::Line();
+                    auto line = new TextLayout::Line();
                     layout->addLine (line);
 
                     line->lineOrigin = Point<float> (baselineOriginX, baselineOriginY);
                 }
             }
 
-            TextLayout::Line& glyphLine = layout->getLine (currentLine);
+            auto& glyphLine = layout->getLine (currentLine);
 
             DWRITE_FONT_METRICS dwFontMetrics;
             glyphRun->fontFace->GetMetrics (&dwFontMetrics);
@@ -117,27 +115,27 @@ namespace DirectWriteTypeLayout
             glyphLine.ascent  = jmax (glyphLine.ascent,  scaledFontSize (dwFontMetrics.ascent,  dwFontMetrics, *glyphRun));
             glyphLine.descent = jmax (glyphLine.descent, scaledFontSize (dwFontMetrics.descent, dwFontMetrics, *glyphRun));
 
-            TextLayout::Run* const glyphRunLayout = new TextLayout::Run (Range<int> (runDescription->textPosition,
-                                                                                     runDescription->textPosition + runDescription->stringLength),
-                                                                         glyphRun->glyphCount);
+            auto glyphRunLayout = new TextLayout::Run (Range<int> (runDescription->textPosition,
+                                                                   runDescription->textPosition + runDescription->stringLength),
+                                                       glyphRun->glyphCount);
             glyphLine.runs.add (glyphRunLayout);
 
             glyphRun->fontFace->GetMetrics (&dwFontMetrics);
-            const float totalHeight = std::abs ((float) dwFontMetrics.ascent) + std::abs ((float) dwFontMetrics.descent);
-            const float fontHeightToEmSizeFactor = (float) dwFontMetrics.designUnitsPerEm / totalHeight;
+            auto totalHeight = std::abs ((float) dwFontMetrics.ascent) + std::abs ((float) dwFontMetrics.descent);
+            auto fontHeightToEmSizeFactor = (float) dwFontMetrics.designUnitsPerEm / totalHeight;
 
             glyphRunLayout->font = getFontForRun (*glyphRun, glyphRun->fontEmSize / fontHeightToEmSizeFactor);
             glyphRunLayout->colour = getColourOf (static_cast<ID2D1SolidColorBrush*> (clientDrawingEffect));
 
-            const Point<float> lineOrigin (layout->getLine (currentLine).lineOrigin);
-            float x = baselineOriginX - lineOrigin.x;
+            auto lineOrigin = layout->getLine (currentLine).lineOrigin;
+            auto x = baselineOriginX - lineOrigin.x;
 
-            const float extraKerning = glyphRunLayout->font.getExtraKerningFactor()
-                                          * glyphRunLayout->font.getHeight();
+            auto extraKerning = glyphRunLayout->font.getExtraKerningFactor()
+                                   * glyphRunLayout->font.getHeight();
 
             for (UINT32 i = 0; i < glyphRun->glyphCount; ++i)
             {
-                const float advance = glyphRun->glyphAdvances[i];
+                auto advance = glyphRun->glyphAdvances[i];
 
                 if ((glyphRun->bidiLevel & 1) != 0)
                     x -= advance + extraKerning;  // RTL text
@@ -156,8 +154,8 @@ namespace DirectWriteTypeLayout
     private:
         const AttributedString& attributedString;
         IDWriteFontCollection& fontCollection;
-        int currentLine;
-        float lastOriginY;
+        int currentLine = -1;
+        float lastOriginY = -10000.0f;
 
         static float scaledFontSize (int n, const DWRITE_FONT_METRICS& metrics, const DWRITE_GLYPH_RUN& glyphRun) noexcept
         {
@@ -177,15 +175,15 @@ namespace DirectWriteTypeLayout
         {
             for (int i = 0; i < attributedString.getNumAttributes(); ++i)
             {
-                const Font& font = attributedString.getAttribute(i).font;
+                auto& font = attributedString.getAttribute(i).font;
 
-                if (WindowsDirectWriteTypeface* wt = dynamic_cast<WindowsDirectWriteTypeface*> (font.getTypeface()))
+                if (auto* wt = dynamic_cast<WindowsDirectWriteTypeface*> (font.getTypeface()))
                     if (wt->getIDWriteFontFace() == glyphRun.fontFace)
                         return font.withHeight (fontHeight);
             }
 
             ComSmartPtr<IDWriteFont> dwFont;
-            HRESULT hr = fontCollection.GetFontFromFontFace (glyphRun.fontFace, dwFont.resetAndGetPointerAddress());
+            auto hr = fontCollection.GetFontFromFontFace (glyphRun.fontFace, dwFont.resetAndGetPointerAddress());
             jassert (dwFont != nullptr);
 
             ComSmartPtr<IDWriteFontFamily> dwFontFamily;
@@ -261,7 +259,7 @@ namespace DirectWriteTypeLayout
         range.length = jmin (attr.range.getLength(), textLen - attr.range.getStart());
 
         {
-            const String familyName (FontStyleHelpers::getConcreteFamilyName (attr.font));
+            auto familyName = FontStyleHelpers::getConcreteFamilyName (attr.font);
 
             BOOL fontFound = false;
             uint32 fontIndex;
@@ -271,7 +269,7 @@ namespace DirectWriteTypeLayout
                 fontIndex = 0;
 
             ComSmartPtr<IDWriteFontFamily> fontFamily;
-            HRESULT hr = fontCollection.GetFontFamily (fontIndex, fontFamily.resetAndGetPointerAddress());
+            auto hr = fontCollection.GetFontFamily (fontIndex, fontFamily.resetAndGetPointerAddress());
 
             ComSmartPtr<IDWriteFont> dwFont;
             uint32 fontFacesCount = 0;
@@ -290,12 +288,12 @@ namespace DirectWriteTypeLayout
             textLayout.SetFontStretch (dwFont->GetStretch(), range);
             textLayout.SetFontStyle (dwFont->GetStyle(), range);
 
-            const float fontHeightToEmSizeFactor = getFontHeightToEmSizeFactor (*dwFont);
+            auto fontHeightToEmSizeFactor = getFontHeightToEmSizeFactor (*dwFont);
             textLayout.SetFontSize (attr.font.getHeight() * fontHeightToEmSizeFactor, range);
         }
 
         {
-            const Colour col (attr.colour);
+            auto col = attr.colour;
             ComSmartPtr<ID2D1SolidColorBrush> d2dBrush;
             renderTarget.CreateSolidColorBrush (D2D1::ColorF (col.getFloatRed(),
                                                               col.getFloatGreen(),
@@ -308,7 +306,7 @@ namespace DirectWriteTypeLayout
         }
     }
 
-    bool setupLayout (const AttributedString& text, const float maxWidth, const float maxHeight,
+    bool setupLayout (const AttributedString& text, float maxWidth, float maxHeight,
                       ID2D1RenderTarget& renderTarget, IDWriteFactory& directWriteFactory,
                       IDWriteFontCollection& fontCollection, ComSmartPtr<IDWriteTextLayout>& textLayout)
     {
@@ -324,14 +322,14 @@ namespace DirectWriteTypeLayout
             fontIndex = 0;
 
         ComSmartPtr<IDWriteFontFamily> dwFontFamily;
-        HRESULT hr = fontCollection.GetFontFamily (fontIndex, dwFontFamily.resetAndGetPointerAddress());
+        auto hr = fontCollection.GetFontFamily (fontIndex, dwFontFamily.resetAndGetPointerAddress());
 
         ComSmartPtr<IDWriteFont> dwFont;
         hr = dwFontFamily->GetFirstMatchingFont (DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL,
                                                  dwFont.resetAndGetPointerAddress());
         jassert (dwFont != nullptr);
 
-        const float defaultFontHeightToEmSizeFactor = getFontHeightToEmSizeFactor (*dwFont);
+        auto defaultFontHeightToEmSizeFactor = getFontHeightToEmSizeFactor (*dwFont);
 
         ComSmartPtr<IDWriteTextFormat> dwTextFormat;
         hr = directWriteFactory.CreateTextFormat (defaultFont.getTypefaceName().toWideCharPointer(), &fontCollection,
@@ -348,7 +346,7 @@ namespace DirectWriteTypeLayout
             hr = dwTextFormat->SetTrimming (&trimming, trimmingSign);
         }
 
-        const int textLen = text.getText().length();
+        auto textLen = text.getText().length();
 
         hr = directWriteFactory.CreateTextLayout (text.getText().toWideCharPointer(), textLen, dwTextFormat,
                                                   maxWidth, maxHeight, textLayout.resetAndGetPointerAddress());
@@ -356,7 +354,7 @@ namespace DirectWriteTypeLayout
         if (FAILED (hr) || textLayout == nullptr)
             return false;
 
-        const int numAttributes = text.getNumAttributes();
+        auto numAttributes = text.getNumAttributes();
 
         for (int i = 0; i < numAttributes; ++i)
             addAttributedRange (text.getAttribute (i), *textLayout, textLen, renderTarget, fontCollection);
@@ -376,7 +374,7 @@ namespace DirectWriteTypeLayout
             return;
 
         UINT32 actualLineCount = 0;
-        HRESULT hr = dwTextLayout->GetLineMetrics (nullptr, 0, &actualLineCount);
+        auto hr = dwTextLayout->GetLineMetrics (nullptr, 0, &actualLineCount);
 
         layout.ensureStorageAllocated (actualLineCount);
 
@@ -388,13 +386,13 @@ namespace DirectWriteTypeLayout
         HeapBlock<DWRITE_LINE_METRICS> dwLineMetrics (actualLineCount);
         hr = dwTextLayout->GetLineMetrics (dwLineMetrics, actualLineCount, &actualLineCount);
         int lastLocation = 0;
-        const int numLines = jmin ((int) actualLineCount, layout.getNumLines());
+        auto numLines = jmin ((int) actualLineCount, layout.getNumLines());
         float yAdjustment = 0;
-        const float extraLineSpacing = text.getLineSpacing();
+        auto extraLineSpacing = text.getLineSpacing();
 
         for (int i = 0; i < numLines; ++i)
         {
-            TextLayout::Line& line = layout.getLine (i);
+            auto& line = layout.getLine (i);
             line.stringRange = Range<int> (lastLocation, (int) lastLocation + dwLineMetrics[i].length);
             line.lineOrigin.y += yAdjustment;
             yAdjustment += extraLineSpacing;
@@ -422,7 +420,7 @@ namespace DirectWriteTypeLayout
 
 static bool canAllTypefacesBeUsedInLayout (const AttributedString& text)
 {
-    const int numCharacterAttributes = text.getNumAttributes();
+    auto numCharacterAttributes = text.getNumAttributes();
 
     for (int i = 0; i < numCharacterAttributes; ++i)
         if (dynamic_cast<WindowsDirectWriteTypeface*> (text.getAttribute(i).font.getTypeface()) == nullptr)
diff --git a/modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp b/modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp
index 2643d1a169..b4d53b44b3 100644
--- a/modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp
+++ b/modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp
@@ -36,7 +36,8 @@ namespace
 
         uint32 index = 0;
         BOOL exists = false;
-        HRESULT hr = names->FindLocaleName (L"en-us", &index, &exists);
+        auto hr = names->FindLocaleName (L"en-us", &index, &exists);
+
         if (! exists)
             index = 0;
 
@@ -53,7 +54,7 @@ namespace
     {
         jassert (family != nullptr);
         ComSmartPtr<IDWriteLocalizedStrings> familyNames;
-        HRESULT hr = family->GetFamilyNames (familyNames.resetAndGetPointerAddress());
+        auto hr = family->GetFamilyNames (familyNames.resetAndGetPointerAddress());
         jassert (SUCCEEDED (hr)); ignoreUnused (hr);
         return getLocalisedName (familyNames);
     }
@@ -62,7 +63,7 @@ namespace
     {
         jassert (font != nullptr);
         ComSmartPtr<IDWriteLocalizedStrings> faceNames;
-        HRESULT hr = font->GetFaceNames (faceNames.resetAndGetPointerAddress());
+        auto hr = font->GetFaceNames (faceNames.resetAndGetPointerAddress());
         jassert (SUCCEEDED (hr)); ignoreUnused (hr);
         return getLocalisedName (faceNames);
     }
@@ -106,12 +107,12 @@ public:
 
             if (d2dFactory != nullptr)
             {
-                D2D1_RENDER_TARGET_PROPERTIES d2dRTProp = D2D1::RenderTargetProperties (D2D1_RENDER_TARGET_TYPE_SOFTWARE,
-                                                                                        D2D1::PixelFormat (DXGI_FORMAT_B8G8R8A8_UNORM,
-                                                                                                           D2D1_ALPHA_MODE_IGNORE),
-                                                                                        0, 0,
-                                                                                        D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE,
-                                                                                        D2D1_FEATURE_LEVEL_DEFAULT);
+                auto d2dRTProp = D2D1::RenderTargetProperties (D2D1_RENDER_TARGET_TYPE_SOFTWARE,
+                                                               D2D1::PixelFormat (DXGI_FORMAT_B8G8R8A8_UNORM,
+                                                                                  D2D1_ALPHA_MODE_IGNORE),
+                                                               0, 0,
+                                                               D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE,
+                                                               D2D1_FEATURE_LEVEL_DEFAULT);
 
                 d2dFactory->CreateDCRenderTarget (&d2dRTProp, directWriteRenderTarget.resetAndGetPointerAddress());
             }
@@ -142,14 +143,14 @@ class WindowsDirectWriteTypeface  : public Typeface
 {
 public:
     WindowsDirectWriteTypeface (const Font& font, IDWriteFontCollection* fontCollection)
-        : Typeface (font.getTypefaceName(), font.getTypefaceStyle()),
-          unitsToHeightScaleFactor (1.0f), heightToPointsFactor (1.0f), ascent (0.0f)
+        : Typeface (font.getTypefaceName(), font.getTypefaceStyle())
     {
         jassert (fontCollection != nullptr);
 
         BOOL fontFound = false;
         uint32 fontIndex = 0;
-        HRESULT hr = fontCollection->FindFamilyName (font.getTypefaceName().toWideCharPointer(), &fontIndex, &fontFound);
+        auto hr = fontCollection->FindFamilyName (font.getTypefaceName().toWideCharPointer(), &fontIndex, &fontFound);
+
         if (! fontFound)
             fontIndex = 0;
 
@@ -190,18 +191,18 @@ public:
             designUnitsPerEm = dwFontMetrics.designUnitsPerEm;
 
             ascent = std::abs ((float) dwFontMetrics.ascent);
-            const float totalSize = ascent + std::abs ((float) dwFontMetrics.descent);
+            auto totalSize = ascent + std::abs ((float) dwFontMetrics.descent);
             ascent /= totalSize;
             unitsToHeightScaleFactor = designUnitsPerEm / totalSize;
 
-            HDC tempDC = GetDC (0);
-            float dpi = (GetDeviceCaps (tempDC, LOGPIXELSX) + GetDeviceCaps (tempDC, LOGPIXELSY)) / 2.0f;
+            auto tempDC = GetDC (0);
+            auto dpi = (GetDeviceCaps (tempDC, LOGPIXELSX) + GetDeviceCaps (tempDC, LOGPIXELSY)) / 2.0f;
             heightToPointsFactor = (dpi / GetDeviceCaps (tempDC, LOGPIXELSY)) * unitsToHeightScaleFactor;
             ReleaseDC (0, tempDC);
 
-            const float pathAscent  = (1024.0f * dwFontMetrics.ascent)  / designUnitsPerEm;
-            const float pathDescent = (1024.0f * dwFontMetrics.descent) / designUnitsPerEm;
-            const float pathScale   = 1.0f / (std::abs (pathAscent) + std::abs (pathDescent));
+            auto pathAscent  = (1024.0f * dwFontMetrics.ascent)  / designUnitsPerEm;
+            auto pathDescent = (1024.0f * dwFontMetrics.descent) / designUnitsPerEm;
+            auto pathScale   = 1.0f / (std::abs (pathAscent) + std::abs (pathDescent));
             pathTransform = AffineTransform::scale (pathScale);
         }
     }
@@ -214,8 +215,8 @@ public:
 
     float getStringWidth (const String& text)
     {
-        const CharPointer_UTF32 textUTF32 (text.toUTF32());
-        const size_t len = textUTF32.length();
+        auto textUTF32 = text.toUTF32();
+        auto len = textUTF32.length();
 
         HeapBlock<UINT16> glyphIndices (len);
         dwFontFace->GetGlyphIndices (textUTF32, (UINT32) len, glyphIndices);
@@ -224,6 +225,7 @@ public:
         dwFontFace->GetDesignGlyphMetrics (glyphIndices, (UINT32) len, dwGlyphMetrics, false);
 
         float x = 0;
+
         for (size_t i = 0; i < len; ++i)
             x += (float) dwGlyphMetrics[i].advanceWidth / designUnitsPerEm;
 
@@ -234,8 +236,8 @@ public:
     {
         xOffsets.add (0);
 
-        const CharPointer_UTF32 textUTF32 (text.toUTF32());
-        const size_t len = textUTF32.length();
+        auto textUTF32 = text.toUTF32();
+        auto len = textUTF32.length();
 
         HeapBlock<UINT16> glyphIndices (len);
         dwFontFace->GetGlyphIndices (textUTF32, (UINT32) len, glyphIndices);
@@ -243,6 +245,7 @@ public:
         dwFontFace->GetDesignGlyphMetrics (glyphIndices, (UINT32) len, dwGlyphMetrics, false);
 
         float x = 0;
+
         for (size_t i = 0; i < len; ++i)
         {
             x += (float) dwGlyphMetrics[i].advanceWidth / designUnitsPerEm;
@@ -254,10 +257,11 @@ public:
     bool getOutlineForGlyph (int glyphNumber, Path& path)
     {
         jassert (path.isEmpty());  // we might need to apply a transform to the path, so this must be empty
-        UINT16 glyphIndex = (UINT16) glyphNumber;
+        auto glyphIndex = (UINT16) glyphNumber;
         ComSmartPtr<PathGeometrySink> pathGeometrySink (new PathGeometrySink());
 
-        dwFontFace->GetGlyphRunOutline (1024.0f, &glyphIndex, nullptr, nullptr, 1, false, false, pathGeometrySink);
+        dwFontFace->GetGlyphRunOutline (1024.0f, &glyphIndex, nullptr, nullptr,
+                                        1, false, false, pathGeometrySink);
         path = pathGeometrySink->path;
 
         if (! pathTransform.isIdentity())
@@ -273,8 +277,8 @@ public:
 private:
     SharedResourcePointer<Direct2DFactories> factories;
     ComSmartPtr<IDWriteFontFace> dwFontFace;
-    float unitsToHeightScaleFactor, heightToPointsFactor, ascent;
-    int designUnitsPerEm;
+    float unitsToHeightScaleFactor = 1.0f, heightToPointsFactor = 1.0f, ascent = 0;
+    int designUnitsPerEm = 0;
     AffineTransform pathTransform;
 
     struct PathGeometrySink  : public ComBaseClassHelper<IDWriteGeometrySink>
diff --git a/modules/juce_graphics/native/juce_win32_Fonts.cpp b/modules/juce_graphics/native/juce_win32_Fonts.cpp
index a62151c3d5..7489521ff6 100644
--- a/modules/juce_graphics/native/juce_win32_Fonts.cpp
+++ b/modules/juce_graphics/native/juce_win32_Fonts.cpp
@@ -63,14 +63,14 @@ namespace TTFNameExtractor
                                    const int64 directoryOffset, const int64 offsetOfStringStorage)
     {
         String result;
-        const int64 oldPos = input.getPosition();
+        auto oldPos = input.getPosition();
         input.setPosition (directoryOffset + offsetOfStringStorage + ByteOrder::swapIfLittleEndian (nameRecord.offsetFromStorageArea));
-        const int stringLength = (int) ByteOrder::swapIfLittleEndian (nameRecord.stringLength);
-        const int platformID = ByteOrder::swapIfLittleEndian (nameRecord.platformID);
+        auto stringLength = (int) ByteOrder::swapIfLittleEndian (nameRecord.stringLength);
+        auto platformID = ByteOrder::swapIfLittleEndian (nameRecord.platformID);
 
         if (platformID == 0 || platformID == 3)
         {
-            const int numChars = stringLength / 2 + 1;
+            auto numChars = stringLength / 2 + 1;
             HeapBlock<uint16> buffer;
             buffer.calloc (numChars + 1);
             input.read (buffer, stringLength);
@@ -165,10 +165,8 @@ namespace FontEnumerators
             const String fontName (lpelfe->elfLogFont.lfFaceName);
             fontName.copyToUTF16 (lf.lfFaceName, sizeof (lf.lfFaceName));
 
-            HDC dc = CreateCompatibleDC (0);
-            EnumFontFamiliesEx (dc, &lf,
-                                (FONTENUMPROCW) &fontEnum2,
-                                lParam, 0);
+            auto dc = CreateCompatibleDC (0);
+            EnumFontFamiliesEx (dc, &lf, (FONTENUMPROCW) &fontEnum2, lParam, 0);
             DeleteDC (dc);
         }
 
@@ -191,7 +189,7 @@ StringArray Font::findAllTypefaceNames()
 
         for (uint32 i = 0; i < fontFamilyCount; ++i)
         {
-            HRESULT hr = factories->systemFonts->GetFontFamily (i, fontFamily.resetAndGetPointerAddress());
+            auto hr = factories->systemFonts->GetFontFamily (i, fontFamily.resetAndGetPointerAddress());
 
             if (SUCCEEDED (hr))
                 results.addIfNotAlreadyThere (getFontFamilyName (fontFamily));
@@ -200,7 +198,7 @@ StringArray Font::findAllTypefaceNames()
     else
    #endif
     {
-        HDC dc = CreateCompatibleDC (0);
+        auto dc = CreateCompatibleDC (0);
 
         {
             LOGFONTW lf = { 0 };
@@ -237,7 +235,8 @@ StringArray Font::findAllTypefaceStyles (const String& family)
     {
         BOOL fontFound = false;
         uint32 fontIndex = 0;
-        HRESULT hr = factories->systemFonts->FindFamilyName (family.toWideCharPointer(), &fontIndex, &fontFound);
+        auto hr = factories->systemFonts->FindFamilyName (family.toWideCharPointer(), &fontIndex, &fontFound);
+
         if (! fontFound)
             fontIndex = 0;
 
@@ -302,7 +301,7 @@ Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font)
     static DefaultFontNames defaultNames;
 
     Font newFont (font);
-    const String& faceName = font.getTypefaceName();
+    auto& faceName = font.getTypefaceName();
 
     if (faceName == getDefaultSansSerifFontName())       newFont.setTypefaceName (defaultNames.defaultSans);
     else if (faceName == getDefaultSerifFontName())      newFont.setTypefaceName (defaultNames.defaultSerif);
@@ -318,22 +317,14 @@ Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font)
 class WindowsTypeface   : public Typeface
 {
 public:
-    WindowsTypeface (const Font& font)
-        : Typeface (font.getTypefaceName(), font.getTypefaceStyle()),
-          fontH (0), previousFontH (0),
-          dc (CreateCompatibleDC (0)), memoryFont (0),
-          ascent (1.0f), heightToPointsFactor (1.0f),
-          defaultGlyph (-1)
+    WindowsTypeface (const Font& font)  : Typeface (font.getTypefaceName(),
+                                                    font.getTypefaceStyle())
     {
         loadFont();
     }
 
     WindowsTypeface (const void* data, size_t dataSize)
-        : Typeface (String(), String()),
-          fontH (0), previousFontH (0),
-          dc (CreateCompatibleDC (0)), memoryFont (0),
-          ascent (1.0f), heightToPointsFactor (1.0f),
-          defaultGlyph (-1)
+        : Typeface (String(), String())
     {
         DWORD numInstalled = 0;
         memoryFont = AddFontMemResourceEx (const_cast<void*> (data), (DWORD) dataSize,
@@ -362,8 +353,8 @@ public:
 
     float getStringWidth (const String& text)
     {
-        const CharPointer_UTF16 utf16 (text.toUTF16());
-        const size_t numChars = utf16.length();
+        auto utf16 = text.toUTF16();
+        auto numChars = utf16.length();
         HeapBlock<uint16> results (numChars);
         float x = 0;
 
@@ -377,10 +368,10 @@ public:
         return x;
     }
 
-    void getGlyphPositions (const String& text, Array <int>& resultGlyphs, Array <float>& xOffsets)
+    void getGlyphPositions (const String& text, Array<int>& resultGlyphs, Array<float>& xOffsets)
     {
-        const CharPointer_UTF16 utf16 (text.toUTF16());
-        const size_t numChars = utf16.length();
+        auto utf16 = text.toUTF16();
+        auto numChars = utf16.length();
         HeapBlock<uint16> results (numChars);
         float x = 0;
 
@@ -408,8 +399,8 @@ public:
 
         GLYPHMETRICS gm;
         // (although GetGlyphOutline returns a DWORD, it may be -1 on failure, so treat it as signed int..)
-        const int bufSize = (int) GetGlyphOutline (dc, (UINT) glyphNumber, GGO_NATIVE | GGO_GLYPH_INDEX,
-                                                   &gm, 0, 0, &identityMatrix);
+        auto bufSize = (int) GetGlyphOutline (dc, (UINT) glyphNumber, GGO_NATIVE | GGO_GLYPH_INDEX,
+                                              &gm, 0, 0, &identityMatrix);
 
         if (bufSize > 0)
         {
@@ -417,18 +408,18 @@ public:
             GetGlyphOutline (dc, (UINT) glyphNumber, GGO_NATIVE | GGO_GLYPH_INDEX, &gm,
                              bufSize, data, &identityMatrix);
 
-            const TTPOLYGONHEADER* pheader = reinterpret_cast<TTPOLYGONHEADER*> (data.getData());
+            auto pheader = reinterpret_cast<const TTPOLYGONHEADER*> (data.getData());
 
-            const float scaleX = 1.0f / tm.tmHeight;
-            const float scaleY = -scaleX;
+            auto scaleX = 1.0f / tm.tmHeight;
+            auto scaleY = -scaleX;
 
             while ((char*) pheader < data + bufSize)
             {
                 glyphPath.startNewSubPath (scaleX * pheader->pfxStart.x.value,
                                            scaleY * pheader->pfxStart.y.value);
 
-                const TTPOLYCURVE* curve = (const TTPOLYCURVE*) ((const char*) pheader + sizeof (TTPOLYGONHEADER));
-                const char* const curveEnd = ((const char*) pheader) + pheader->cb;
+                auto curve = (const TTPOLYCURVE*) ((const char*) pheader + sizeof (TTPOLYGONHEADER));
+                auto curveEnd = ((const char*) pheader) + pheader->cb;
 
                 while ((const char*) curve < curveEnd)
                 {
@@ -442,10 +433,10 @@ public:
                     {
                         for (int i = 0; i < curve->cpfx - 1; ++i)
                         {
-                            const float x2 = scaleX * curve->apfx[i].x.value;
-                            const float y2 = scaleY * curve->apfx[i].y.value;
-                            float x3       = scaleX * curve->apfx[i + 1].x.value;
-                            float y3       = scaleY * curve->apfx[i + 1].y.value;
+                            auto x2 = scaleX * curve->apfx[i].x.value;
+                            auto y2 = scaleY * curve->apfx[i].y.value;
+                            auto x3 = scaleX * curve->apfx[i + 1].x.value;
+                            auto y3 = scaleY * curve->apfx[i + 1].y.value;
 
                             if (i < curve->cpfx - 2)
                             {
@@ -471,13 +462,13 @@ public:
 
 private:
     static const MAT2 identityMatrix;
-    HFONT fontH;
-    HGDIOBJ previousFontH;
-    HDC dc;
+    HFONT fontH = {};
+    HGDIOBJ previousFontH = {};
+    HDC dc { CreateCompatibleDC (0) };
     TEXTMETRIC tm;
-    HANDLE memoryFont;
-    float ascent, heightToPointsFactor;
-    int defaultGlyph, heightInPoints;
+    HANDLE memoryFont = {};
+    float ascent = 1.0f, heightToPointsFactor = 1.0f;
+    int defaultGlyph = -1, heightInPoints = 0;
 
     struct KerningPair
     {
@@ -514,15 +505,15 @@ private:
         lf.lfHeight = -256;
         name.copyToUTF16 (lf.lfFaceName, sizeof (lf.lfFaceName));
 
-        HFONT standardSizedFont = CreateFontIndirect (&lf);
+        auto standardSizedFont = CreateFontIndirect (&lf);
 
         if (standardSizedFont != 0)
         {
             if ((previousFontH = SelectObject (dc, standardSizedFont)) != 0)
             {
                 fontH = standardSizedFont;
-
                 OUTLINETEXTMETRIC otm;
+
                 if (GetOutlineTextMetrics (dc, sizeof (otm), &otm) != 0)
                 {
                     heightInPoints = otm.otmEMSquare;
@@ -537,7 +528,7 @@ private:
 
         if (GetTextMetrics (dc, &tm))
         {
-            float dpi = (GetDeviceCaps (dc, LOGPIXELSX) + GetDeviceCaps (dc, LOGPIXELSY)) / 2.0f;
+            auto dpi = (GetDeviceCaps (dc, LOGPIXELSX) + GetDeviceCaps (dc, LOGPIXELSY)) / 2.0f;
             heightToPointsFactor = (dpi / GetDeviceCaps (dc, LOGPIXELSY)) * heightInPoints / (float) tm.tmHeight;
             ascent = tm.tmAscent / (float) tm.tmHeight;
             defaultGlyph = getGlyphForChar (dc, tm.tmDefaultChar);
@@ -545,10 +536,10 @@ private:
         }
     }
 
-    void createKerningPairs (HDC hdc, const float height)
+    void createKerningPairs (HDC hdc, float height)
     {
         HeapBlock<KERNINGPAIR> rawKerning;
-        const DWORD numKPs = GetKerningPairs (hdc, 0, 0);
+        auto numKPs = GetKerningPairs (hdc, 0, 0);
         rawKerning.calloc (numKPs);
         GetKerningPairs (hdc, numKPs, rawKerning);
 
@@ -560,7 +551,7 @@ private:
             kp.glyph1 = getGlyphForChar (hdc, rawKerning[i].wFirst);
             kp.glyph2 = getGlyphForChar (hdc, rawKerning[i].wSecond);
 
-            const int standardWidth = getGlyphWidth (hdc, kp.glyph1);
+            auto standardWidth = getGlyphWidth (hdc, kp.glyph1);
             kp.kerning = (standardWidth + rawKerning[i].iKernAmount) / height;
             kerningPairs.add (kp);
 
@@ -590,12 +581,12 @@ private:
         return gm.gmCellIncX;
     }
 
-    float getKerning (HDC hdc, const int glyph1, const int glyph2)
+    float getKerning (HDC hdc, int glyph1, int glyph2)
     {
         KerningPair kp;
         kp.glyph1 = glyph1;
         kp.glyph2 = glyph2;
-        int index = kerningPairs.indexOf (kp);
+        auto index = kerningPairs.indexOf (kp);
 
         if (index < 0)
         {
diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h
index 5265b94a78..c101c3ecf0 100644
--- a/modules/juce_gui_basics/components/juce_Component.h
+++ b/modules/juce_gui_basics/components/juce_Component.h
@@ -2123,7 +2123,7 @@ public:
         and you can test whether it's null before using it to see if something has deleted
         it.
 
-        The ComponentType typedef must be Component, or some subclass of Component.
+        The ComponentType template parameter must be Component, or some subclass of Component.
 
         You may also want to use a WeakReference<Component> object for the same purpose.
     */
diff --git a/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h b/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
index 346fefe438..79fcb50059 100644
--- a/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
+++ b/modules/juce_gui_basics/mouse/juce_SelectedItemSet.h
@@ -47,9 +47,9 @@ class SelectedItemSet   : public ChangeBroadcaster
 {
 public:
     //==============================================================================
-    typedef SelectableItemType ItemType;
-    typedef Array<SelectableItemType> ItemArray;
-    typedef typename TypeHelpers::ParameterType<SelectableItemType>::type ParameterType;
+    using ItemType = SelectableItemType;
+    using ItemArray = Array<SelectableItemType>;
+    using ParameterType = typename TypeHelpers::ParameterType<SelectableItemType>::type;
 
     //==============================================================================
     /** Creates an empty set. */