diff --git a/libqpdf/QPDFAcroFormDocumentHelper.cc b/libqpdf/QPDFAcroFormDocumentHelper.cc
index ac65a73..531b26b 100644
--- a/libqpdf/QPDFAcroFormDocumentHelper.cc
+++ b/libqpdf/QPDFAcroFormDocumentHelper.cc
@@ -1,6 +1,6 @@
 #include <qpdf/QPDFAcroFormDocumentHelper.hh>
 
-#include <qpdf/FormField.hh>
+#include <qpdf/AcroForm.hh>
 
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QPDFObjectHandle_private.hh>
diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc
index a7ecb24..58fbece 100644
--- a/libqpdf/QPDFFormFieldObjectHelper.cc
+++ b/libqpdf/QPDFFormFieldObjectHelper.cc
@@ -1,6 +1,6 @@
 #include <qpdf/QPDFFormFieldObjectHelper.hh>
 
-#include <qpdf/FormField.hh>
+#include <qpdf/AcroForm.hh>
 
 #include <qpdf/Pl_QPDFTokenizer.hh>
 #include <qpdf/QIntC.hh>
diff --git a/libqpdf/qpdf/FormField.hh b/libqpdf/qpdf/AcroForm.hh
index 8ea8a10..8733aa5 100644
--- a/libqpdf/qpdf/FormField.hh
+++ b/libqpdf/qpdf/AcroForm.hh
@@ -1,5 +1,5 @@
-#ifndef FORMFIELD_HH
-#define FORMFIELD_HH
+#ifndef ACRO_FORM_HH
+#define ACRO_FORM_HH
 
 #include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QPDFObjectHelper.hh>
@@ -422,4 +422,4 @@ namespace qpdf::impl
     }; // class FormNode
 } // namespace qpdf::impl
 
-#endif // FORMFIELD_HH
+#endif // ACRO_FORM_HH