diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
index 29ff714..78ef179 100644
--- a/core/fpdfdoc/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -44,7 +44,7 @@
 // If values are added to FormFieldType, these will need to be updated.
 #ifdef PDF_ENABLE_XFA
 constexpr size_t kFormFieldTypeCount = 16;
-#else
+#else   // PDF_ENABLE_XFA
 constexpr size_t kFormFieldTypeCount = 8;
 #endif  // PDF_ENABLE_XFA
 
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 40e04e8..cd863bd 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -465,7 +465,7 @@
                                      : XFA_VALUEPICTURE_Edit);
     }
   }
-#else
+#else   // PDF_ENABLE_XFA
 WideString CPDFSDK_Widget::GetValue() const {
 #endif  // PDF_ENABLE_XFA
   CPDF_FormField* pFormField = GetFormField();
diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index 43482ea..4d85fac 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -72,7 +72,7 @@
   int GetSelectedIndex(int nIndex) const;
 #ifdef PDF_ENABLE_XFA
   WideString GetValue(bool bDisplay = true) const;
-#else
+#else   // PDF_ENABLE_XFA
   WideString GetValue() const;
 #endif  // PDF_ENABLE_XFA
   WideString GetDefaultValue() const;
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index cef5e9a..1eedda3 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -79,9 +79,9 @@
   {
 #ifdef PDF_ENABLE_XFA
     const unsigned long kExpected = static_cast<uint32_t>(-1);
-#else
+#else   // PDF_ENABLE_XFA
     const unsigned long kExpected = 0;
-#endif
+#endif  // PDF_ENABLE_XFA
     EXPECT_EQ(kExpected, FPDF_GetDocPermissions(document()));
   }
 
diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h
index f372d84..dc7c54e 100644
--- a/public/fpdf_formfill.h
+++ b/public/fpdf_formfill.h
@@ -1548,7 +1548,7 @@
 
 #ifdef PDF_ENABLE_XFA
 #define FPDF_FORMFIELD_COUNT 16
-#else
+#else  // PDF_ENABLE_XFA
 #define FPDF_FORMFIELD_COUNT 8
 #endif  // PDF_ENABLE_XFA