diff --git a/builds/amiga/include/config/ftmodule.h b/builds/amiga/include/config/ftmodule.h
index 50087554f..73e86d5b6 100644
--- a/builds/amiga/include/config/ftmodule.h
+++ b/builds/amiga/include/config/ftmodule.h
@@ -4,13 +4,8 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-<<<<<<< HEAD
 /*  Copyright (C) 2005-2022 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
-=======
-/*  Copyright (C) 2005-2021 by                                             */
-/*  Werner Lemberg and Detlef W�rkner.                                     */
->>>>>>> d9fdb2202 (Compilation fix attempt #1)
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
@@ -140,10 +135,6 @@ FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
 FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
 #endif
 
-#ifdef FT_USE_DENSE
-FT_USE_MODULE( FT_Renderer_Class, ft_dense_renderer_class )
-#endif
-
 #ifdef FT_USE_SMOOTH
 FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
 #endif
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index ccd032047..f30ffc7d1 100644
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -75,9 +75,9 @@
 #undef  OS_INLINE
 #define OS_INLINE   static __inline__
 #endif
-// #include <CoreServices/CoreServices.h>
-// #include <ApplicationServices/ApplicationServices.h>
-// #include <sys/syslimits.h> /* PATH_MAX */
+#include <CoreServices/CoreServices.h>
+#include <ApplicationServices/ApplicationServices.h>
+#include <sys/syslimits.h> /* PATH_MAX */
 #else
 #include <Resources.h>
 #include <Fonts.h>