diff --git a/.gitignore b/.gitignore
index e4e0227..aef9d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 build
 config.mk
 objs/vc2010/
-src/dlg/dlg/
+include/dlg/
 src/dlg/dlg.c
diff --git a/ChangeLog b/ChangeLog
index 12c2c07..0c038ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-01-07  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[dlg] Move the headers to include/dlg to simplify their use.
+
+	* autogen.sh, builds/toplevel.mk: Copy headers to incluide/dlg.
+	* builds/freetype.mk, builds/windows/vc2010/freetype.vcxproj:
+	Simplify included path.
+	* include/freetype/internal/ftdebug.h: Simplify #include.
+	* src/dlg/rules.mk, .gitignore: Updated.
+
 2021-01-06  Werner Lemberg  <wl@gnu.org>
 
 	* meson.build: Add summary.
diff --git a/autogen.sh b/autogen.sh
index fd5fa1f..77656d6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -165,10 +165,10 @@
 # Copy all necessary 'dlg' files.
 copy_submodule_files ()
 {
-  echo "Copying files from \`submodules/dlg' to \`src/dlg'"
-  mkdir src/dlg/dlg 2> /dev/null
-  cp $DLG_INC_DIR/dlg.h src/dlg/dlg
-  cp $DLG_INC_DIR/output.h src/dlg/dlg
+  echo "Copying files from \`submodules/dlg' to \`src/dlg' and \`include/dlg'"
+  mkdir include/dlg 2> /dev/null
+  cp $DLG_INC_DIR/output.h include/dlg
+  cp $DLG_INC_DIR/dlg.h include/dlg
   cp $DLG_SRC_DIR/* src/dlg
 }
 
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 91455ea..71d3a48 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -101,7 +101,6 @@
 INTERNAL_DIR := $(PUBLIC_DIR)/internal
 SERVICES_DIR := $(INTERNAL_DIR)/services
 CONFIG_DIR   := $(PUBLIC_DIR)/config
-DLG_DIR      := $(TOP_DIR)/src/dlg
 
 # The documentation directory.
 #
@@ -123,7 +122,6 @@
 INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
                                       $(DEVEL_DIR) \
                                       $(BUILD_DIR) \
-                                      $(DLG_DIR) \
                                       $(TOP_DIR)/include)
 
 INCLUDE_FLAGS := $(INCLUDES:%=$I%)
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index b249806..0cad543 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -113,7 +113,7 @@
   include $(TOP_DIR)/builds/detect.mk
 
   # For builds directly from the git repository we need to copy files
-  # from `submodule/dlg' to `src/dlg'.
+  # from `submodule/dlg' to `src/dlg' and `include/dlg'.
   #
   ifeq ($(wildcard src/dlg/dlg.*),)
     ifeq ($(wildcard submodules/dlg/*),)
@@ -122,12 +122,12 @@
       $(shell git submodule update)
     endif
 
-    $(info Copying files from `submodules/dlg' to `src/dlg')
-    $(shell mkdir $(subst /,$(SEP),src/dlg/dlg) $(NO_OUTPUT))
+    $(info Copying files from `submodules/dlg' to `src/dlg' and `include/dlg')
+    $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT))
     $(shell $(COPY) \
-      $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h src/dlg/dlg))
+      $(subst /,$(SEP),submodules/dlg/include/dlg/output.h include/dlg))
     $(shell $(COPY) \
-      $(subst /,$(SEP),submodules/dlg/include/dlg/output.h src/dlg/dlg))
+      $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h include/dlg))
     $(shell $(COPY) \
       $(subst /,$(SEP),submodules/dlg/src/dlg/dlg.c src/dlg))
   endif
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 6178a56..6f63ff9 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -89,8 +89,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -118,8 +118,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -147,8 +147,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -176,8 +176,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
diff --git a/devel/ftoption.h b/devel/ftoption.h
index a845207..fa70756 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -287,7 +287,7 @@
    *   options set by those programs have precedence, overwriting the value
    *   here with the configured one.
    */
-#define FT_CONFIG_OPTION_USE_HARFBUZZ
+/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
 
 
   /**************************************************************************
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 655b50a..96aa550 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -32,8 +32,8 @@
 #include "compiler-macros.h"
 
 #ifdef FT_DEBUG_LOGGING
-#include <../src/dlg/dlg/dlg.h>
-#include <../src/dlg/dlg/output.h>
+#include <dlg/output.h>
+#include <dlg/dlg.h>
 
 #include <freetype/ftlogging.h>
 #endif /* FT_DEBUG_LOGGING */
diff --git a/src/dlg/rules.mk b/src/dlg/rules.mk
index 6df60ad..7a29e16 100644
--- a/src/dlg/rules.mk
+++ b/src/dlg/rules.mk
@@ -32,8 +32,8 @@
 
 # dlg logging library headers
 #
-DLG_H := $(DLG_DIR)/dlg/dlg.h \
-         $(DLG_DIR)/dlg/output.h
+DLG_H := $(TOP_DIR)/include/dlg/dlg.h \
+         $(TOP_DIR)/include/dlg/output.h
 
 
 # dlg logging library object(s)