diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
index 9e6c38a939..b3a5133dbf 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h
@@ -13,6 +13,7 @@
 
 #include <Cry_Vector2.h>
 #include <IXml.h>
+#include <CryCommon/IFont.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/smart_ptr/weak_ptr.h>
 #include <AzCore/std/parallel/shared_mutex.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
deleted file mode 100644
index 7cb971f9e0..0000000000
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <vector>
-
-#define ATOMFONT_EXPORTS
-
-#include <platform.h>
-
-#include <IFont.h>
-
-#include <ILog.h>
-#include <IConsole.h>
-#include <IRenderer.h>
-#include <CrySizer.h>
-
-#define USE_NULLFONT
-
-#if defined(DEDICATED_SERVER)
-#define USE_NULLFONT_ALWAYS 1
-#endif
-
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
index e6fd6785eb..708622f684 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h
@@ -8,9 +8,9 @@
 
 // Description : Dummy font implementation (dedicated server)
 
-
 #pragma once
 
+#define USE_NULLFONT
 
 #if defined(USE_NULLFONT)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
index 4c9f5b283b..3146dcd42e 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h
@@ -18,6 +18,8 @@
 #include <CryCommon/Cry_Math.h>
 #include <CryCommon/Cry_Color.h>
 #include <CryCommon/CryString.h>
+#include <CryCommon/VertexFormats.h>
+#include <CryCommon/IRenderer.h>
 #include "AtomFont.h"
 
 #include <AzCore/std/parallel/mutex.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
index d1507ed7aa..072f159f3f 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h
@@ -13,6 +13,8 @@
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AtomLyIntegration/AtomFont/FontCommon.h>
 
+class ICrySizer;
+
 namespace AZ
 {
     class GlyphBitmap
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
index 6d0999c3d3..abc7e53cff 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 #include <AtomLyIntegration/AtomFont/FontTexture.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
index 3f2c73d741..11305911ed 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 #include <AtomLyIntegration/AtomFont/FontTexture.h>
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
index cb157b95f6..1f3688f527 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
@@ -9,7 +9,6 @@
 // Description : AtomFont class.
 
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
index a33ed4b682..e7d6964a50 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp
@@ -5,7 +5,8 @@
  *
  */
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
+#define USE_NULLFONT
+
 #include "AtomFontSystemComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
@@ -95,8 +96,8 @@ namespace AZ
         #else
                 // The NULL font implementation must be present for all platforms
                 // supporting running as a pure dedicated server.
-                system->GetILog()->LogError("Missing NULL font implementation for dedicated server");
-                env.pCryFont = NULL;
+                system.GetILog()->LogError("Missing NULL font implementation for dedicated server");
+                gEnv->pCryFont = NULL;
         #endif
             }
             else
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
index a317fe2d22..032f4852ba 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp
@@ -8,7 +8,7 @@
 
 // Description : Dummy font implementation (dedicated server)
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
+#define USE_NULLFONT
 
 #if defined(USE_NULLFONT)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
index 50b0adf294..a3a423de11 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
@@ -9,7 +9,6 @@
 // Description : Font class.
 
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
index 8797389fee..870d5f95b8 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp
@@ -9,7 +9,6 @@
 // Description : XML parsing to load a font.
 
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
index 1e1597a083..2e081a36e1 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
index f22fe4c0bb..d1fe2d996c 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp
@@ -10,7 +10,6 @@
 // Purpose:
 //  - Render a glyph outline into a bitmap using FreeType 2
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
index 0665cc8524..48d5ba0a65 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp
@@ -9,7 +9,6 @@
 // Purpose:
 //  - Create and update a texture with the most recently used glyphs
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
index 35b5b3e308..1a71102f1c 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp
@@ -9,10 +9,9 @@
 // Purpose:
 //  - Hold a glyph bitmap and blit it to the main texture
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 #include <AtomLyIntegration/AtomFont/GlyphBitmap.h>
 #include <math.h>
-
+#include <CryCommon/Cry_Math.h>
 
 //-------------------------------------------------------------------------------------------------
 AZ::GlyphBitmap::GlyphBitmap()
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
index 500afdc37e..6b75c15fed 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp
@@ -9,7 +9,6 @@
 // Purpose:
 //  - Manage and cache glyphs, retrieving them from the renderer as needed
 
-#include <AtomLyIntegration/AtomFont/AtomFont_precompiled.h>
 
 #if !defined(USE_NULLFONT_ALWAYS)
 
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
index 28f23813e6..5aed8b23d1 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
+++ b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake
@@ -28,5 +28,4 @@ set(FILES
     Include/AtomLyIntegration/AtomFont/GlyphCache.h
     Include/AtomLyIntegration/AtomFont/AtomNullFont.h
     Include/AtomLyIntegration/AtomFont/resource.h
-    Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
 )