diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 0e99dbb6..7adf2b9f 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -25,7 +25,7 @@ jobs:
           - { os: ubuntu-22.04, compiler: clang, cc: clang-15, cxx: clang++-15 }
           - { os: ubuntu-22.04, compiler: gcc, cc: gcc-13, cxx: g++-13 }
           - { os: macos-12, compiler: clang, cc: clang, cxx: clang++ }
-          - { os: windows-2019, compiler: msvc }
+          - { os: windows-2022, compiler: msvc }
 
     steps:
       - name: ubuntu install ccache
diff --git a/src/odr/internal/html/document_element.cpp b/src/odr/internal/html/document_element.cpp
index 44f14e8c..0394a1f3 100644
--- a/src/odr/internal/html/document_element.cpp
+++ b/src/odr/internal/html/document_element.cpp
@@ -1,11 +1,11 @@
-#include <odr/document_element.hpp>
+#include <odr/internal/html/document_element.hpp>
 
+#include <odr/document_element.hpp>
 #include <odr/document_path.hpp>
 #include <odr/html.hpp>
 
 #include <odr/internal/common/table_cursor.hpp>
 #include <odr/internal/html/common.hpp>
-#include <odr/internal/html/document_element.hpp>
 #include <odr/internal/html/document_style.hpp>
 #include <odr/internal/html/html_writer.hpp>
 #include <odr/internal/html/image_file.hpp>
diff --git a/src/odr/internal/html/document_element.hpp b/src/odr/internal/html/document_element.hpp
index 4ee8eeca..8354b866 100644
--- a/src/odr/internal/html/document_element.hpp
+++ b/src/odr/internal/html/document_element.hpp
@@ -3,6 +3,8 @@
 
 namespace odr {
 class Element;
+class ElementRange;
+class MasterPage;
 
 struct HtmlConfig;
 } // namespace odr