diff --git a/reactos/base/applications/fontview/display.c b/reactos/base/applications/fontview/display.c
index 787a083d1c0..f00992cf028 100644
--- a/reactos/base/applications/fontview/display.c
+++ b/reactos/base/applications/fontview/display.c
@@ -20,7 +20,10 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "display.h"
+#include "precomp.h"
+
+#include <stdio.h>
+#include <malloc.h>
 
 #define SPACING1 8
 #define SPACING2 5
diff --git a/reactos/base/applications/fontview/display.h b/reactos/base/applications/fontview/display.h
index 4a13f8199ff..37b0fc01056 100644
--- a/reactos/base/applications/fontview/display.h
+++ b/reactos/base/applications/fontview/display.h
@@ -1,13 +1,5 @@
 #pragma once
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <commdlg.h>
-
 /* Messages for the display class */
 #define FVM_SETTYPEFACE WM_USER
 #define FVM_SETSTRING (WM_USER + 1)
diff --git a/reactos/base/applications/fontview/fontview.c b/reactos/base/applications/fontview/fontview.c
index 8ecf477fb90..16adf374c83 100644
--- a/reactos/base/applications/fontview/fontview.c
+++ b/reactos/base/applications/fontview/fontview.c
@@ -20,7 +20,13 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "precomp.h"
+
+#include <winnls.h>
+#include <shellapi.h>
+
 #include "fontview.h"
+#include "resource.h"
 
 HINSTANCE g_hInstance;
 EXTLOGFONTW g_ExtLogFontW;
diff --git a/reactos/base/applications/fontview/fontview.h b/reactos/base/applications/fontview/fontview.h
index 578c1c49902..31572fffa72 100644
--- a/reactos/base/applications/fontview/fontview.h
+++ b/reactos/base/applications/fontview/fontview.h
@@ -1,11 +1,4 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <shellapi.h>
-
-#include "resource.h"
-#include "display.h"
+#pragma once
 
 #define MAX_LOADSTRING 50
 #define MAX_BUTTONNAME 30
diff --git a/reactos/base/applications/fontview/precomp.h b/reactos/base/applications/fontview/precomp.h
new file mode 100644
index 00000000000..84cdc25f5d1
--- /dev/null
+++ b/reactos/base/applications/fontview/precomp.h
@@ -0,0 +1,14 @@
+#ifndef _FONTVIEW_PCH_
+#define _FONTVIEW_PCH_
+
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <commdlg.h>
+
+#include "display.h"
+
+#endif /* _FONTVIEW_PCH_ */