Move fpdfsdk/include/formfiller to fpdfsdk/formfiller.

This CL moves the .h files and renames the .cpp files to match.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1809193002 .

23 files changed, 101 insertions, 101 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 9f3b27e9bc..85b65c7c3e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -778,24 +778,24 @@ static_library("javascript") {
 
 static_library("formfiller") {
   sources = [
-    "fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp",
-    "fpdfsdk/formfiller/FFL_CheckBox.cpp",
-    "fpdfsdk/formfiller/FFL_ComboBox.cpp",
-    "fpdfsdk/formfiller/FFL_FormFiller.cpp",
-    "fpdfsdk/formfiller/FFL_IFormFiller.cpp",
-    "fpdfsdk/formfiller/FFL_ListBox.cpp",
-    "fpdfsdk/formfiller/FFL_PushButton.cpp",
-    "fpdfsdk/formfiller/FFL_RadioButton.cpp",
-    "fpdfsdk/formfiller/FFL_TextField.cpp",
-    "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h",
-    "fpdfsdk/include/formfiller/FFL_CheckBox.h",
-    "fpdfsdk/include/formfiller/FFL_ComboBox.h",
-    "fpdfsdk/include/formfiller/FFL_FormFiller.h",
-    "fpdfsdk/include/formfiller/FFL_IFormFiller.h",
-    "fpdfsdk/include/formfiller/FFL_ListBox.h",
-    "fpdfsdk/include/formfiller/FFL_PushButton.h",
-    "fpdfsdk/include/formfiller/FFL_RadioButton.h",
-    "fpdfsdk/include/formfiller/FFL_TextField.h",
+    "fpdfsdk/formfiller/cba_fontmap.cpp",
+    "fpdfsdk/formfiller/cba_fontmap.h",
+    "fpdfsdk/formfiller/cffl_checkbox.cpp",
+    "fpdfsdk/formfiller/cffl_checkbox.h",
+    "fpdfsdk/formfiller/cffl_combobox.cpp",
+    "fpdfsdk/formfiller/cffl_combobox.h",
+    "fpdfsdk/formfiller/cffl_formfiller.cpp",
+    "fpdfsdk/formfiller/cffl_formfiller.h",
+    "fpdfsdk/formfiller/cffl_iformfiller.cpp",
+    "fpdfsdk/formfiller/cffl_iformfiller.h",
+    "fpdfsdk/formfiller/cffl_listbox.cpp",
+    "fpdfsdk/formfiller/cffl_listbox.h",
+    "fpdfsdk/formfiller/cffl_pushbutton.cpp",
+    "fpdfsdk/formfiller/cffl_pushbutton.h",
+    "fpdfsdk/formfiller/cffl_radiobutton.cpp",
+    "fpdfsdk/formfiller/cffl_radiobutton.h",
+    "fpdfsdk/formfiller/cffl_textfield.cpp",
+    "fpdfsdk/formfiller/cffl_textfield.h",
   ]
   configs += [ ":pdfium_config" ]
 }
diff --git a/fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
index d7488d1592..0923c4d1ca 100644
--- a/fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp
+++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h
index c3e2e99646..b576d01fc2 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/formfiller/cba_fontmap.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
+#ifndef FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
+#define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
 
 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
 
@@ -43,4 +43,4 @@ class CBA_FontMap : public CPWL_FontMap {
   CFX_ByteString m_sAPType;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
+#endif  // FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
diff --git a/fpdfsdk/formfiller/FFL_CheckBox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index 485f86ba75..c0e3008508 100644
--- a/fpdfsdk/formfiller/FFL_CheckBox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_CheckBox.h"
+#include "fpdfsdk/formfiller/cffl_checkbox.h"
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
 #include "public/fpdf_fwlevent.h"
diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/formfiller/cffl_checkbox.h
index 7536871f16..01f6e3bee4 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/formfiller/cffl_checkbox.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_CHECKBOX_H_
+#define FPDFSDK_FORMFILLER_CFFL_CHECKBOX_H_
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 class CFFL_CheckBox : public CFFL_Button {
  public:
@@ -29,4 +29,4 @@ class CFFL_CheckBox : public CFFL_Button {
   void SaveData(CPDFSDK_PageView* pPageView) override;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_CHECKBOX_H_
diff --git a/fpdfsdk/formfiller/FFL_ComboBox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 5e88a5d133..6a24df0dd9 100644
--- a/fpdfsdk/formfiller/FFL_ComboBox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_ComboBox.h"
+#include "fpdfsdk/formfiller/cffl_combobox.h"
 
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
-#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
+#include "fpdfsdk/formfiller/cffl_iformfiller.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h"
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/formfiller/cffl_combobox.h
index a5ef01b0ea..b59f22bf36 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/formfiller/cffl_combobox.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_
+#define FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_
 
 #include "core/include/fxcrt/fx_string.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 class CBA_FontMap;
 
@@ -66,4 +66,4 @@ class CFFL_ComboBox : public CFFL_FormFiller,
   FFL_ComboBoxState m_State;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_
diff --git a/fpdfsdk/formfiller/FFL_FormFiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index e764c19270..732ea86c4e 100644
--- a/fpdfsdk/formfiller/FFL_FormFiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index f15d40c7a3..b7d8a9dad6 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_FORMFILLER_H_
+#define FPDFSDK_FORMFILLER_CFFL_FORMFILLER_H_
 
 #include <map>
 
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
-#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
+#include "fpdfsdk/formfiller/cffl_iformfiller.h"
 #include "fpdfsdk/include/fsdk_baseform.h"
 
 class CPDFDoc_Environment;
@@ -200,4 +200,4 @@ class CFFL_Button : public CFFL_FormFiller {
   FX_BOOL m_bMouseDown;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_FORMFILLER_H_
diff --git a/fpdfsdk/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp
index 8cc7b40c9f..09d10996a0 100644
--- a/fpdfsdk/formfiller/FFL_IFormFiller.cpp
+++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
+#include "fpdfsdk/formfiller/cffl_iformfiller.h"
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "fpdfsdk/include/formfiller/FFL_CheckBox.h"
-#include "fpdfsdk/include/formfiller/FFL_ComboBox.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
-#include "fpdfsdk/include/formfiller/FFL_ListBox.h"
-#include "fpdfsdk/include/formfiller/FFL_PushButton.h"
-#include "fpdfsdk/include/formfiller/FFL_RadioButton.h"
-#include "fpdfsdk/include/formfiller/FFL_TextField.h"
+#include "fpdfsdk/formfiller/cffl_checkbox.h"
+#include "fpdfsdk/formfiller/cffl_combobox.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
+#include "fpdfsdk/formfiller/cffl_listbox.h"
+#include "fpdfsdk/formfiller/cffl_pushbutton.h"
+#include "fpdfsdk/formfiller/cffl_radiobutton.h"
+#include "fpdfsdk/formfiller/cffl_textfield.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/formfiller/cffl_iformfiller.h
index 95e4cbed17..a966158625 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/formfiller/cffl_iformfiller.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_IFORMFILLER_H_
+#define FPDFSDK_FORMFILLER_CFFL_IFORMFILLER_H_
 
 #include <map>
 
@@ -183,4 +183,4 @@ class CFFL_PrivateData {
   int nValueAge;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_IFORMFILLER_H_
diff --git a/fpdfsdk/formfiller/FFL_ListBox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 638618f784..f5c777743c 100644
--- a/fpdfsdk/formfiller/FFL_ListBox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_ListBox.h"
+#include "fpdfsdk/formfiller/cffl_listbox.h"
 
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
-#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
+#include "fpdfsdk/formfiller/cffl_iformfiller.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/formfiller/cffl_listbox.h
index fe7fed1020..43fbab6642 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/formfiller/cffl_listbox.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_LISTBOX_H_
+#define FPDFSDK_FORMFILLER_CFFL_LISTBOX_H_
 
 #include <set>
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 class CBA_FontMap;
 
@@ -42,4 +42,4 @@ class CFFL_ListBox : public CFFL_FormFiller {
   CFX_ArrayTemplate<int> m_State;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_LISTBOX_H_
diff --git a/fpdfsdk/formfiller/FFL_PushButton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index d5bd509718..9a90f0aca2 100644
--- a/fpdfsdk/formfiller/FFL_PushButton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_PushButton.h"
+#include "fpdfsdk/formfiller/cffl_pushbutton.h"
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
 
 CFFL_PushButton::CFFL_PushButton(CPDFDoc_Environment* pApp,
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/formfiller/cffl_pushbutton.h
index a4d0236321..0d9d82ea0a 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/formfiller/cffl_pushbutton.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_
+#define FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 class CFFL_PushButton : public CFFL_Button {
  public:
@@ -25,4 +25,4 @@ class CFFL_PushButton : public CFFL_Button {
               FX_DWORD dwFlags) override;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_
diff --git a/fpdfsdk/formfiller/FFL_RadioButton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index 029bcf1a17..08263601bb 100644
--- a/fpdfsdk/formfiller/FFL_RadioButton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_RadioButton.h"
+#include "fpdfsdk/formfiller/cffl_radiobutton.h"
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h"
 
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/formfiller/cffl_radiobutton.h
index dba2798e30..f008d1b40f 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/formfiller/cffl_radiobutton.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_RADIOBUTTON_H_
+#define FPDFSDK_FORMFILLER_CFFL_RADIOBUTTON_H_
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 class CFFL_RadioButton : public CFFL_Button {
  public:
@@ -29,4 +29,4 @@ class CFFL_RadioButton : public CFFL_Button {
   void SaveData(CPDFSDK_PageView* pPageView) override;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_RADIOBUTTON_H_
diff --git a/fpdfsdk/formfiller/FFL_TextField.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 42f2aad48f..7399651234 100644
--- a/fpdfsdk/formfiller/FFL_TextField.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/include/formfiller/FFL_TextField.h"
+#include "fpdfsdk/formfiller/cffl_textfield.h"
 
-#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
+#include "fpdfsdk/formfiller/cba_fontmap.h"
 #include "fpdfsdk/include/fsdk_common.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/formfiller/cffl_textfield.h
index f810d8ff64..d7bfc9ee8d 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/formfiller/cffl_textfield.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
+#ifndef FPDFSDK_FORMFILLER_CFFL_TEXTFIELD_H_
+#define FPDFSDK_FORMFILLER_CFFL_TEXTFIELD_H_
 
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 
 #define BF_ALIGN_LEFT 0
 #define BF_ALIGN_MIDDLE 1
@@ -66,4 +66,4 @@ class CFFL_TextField : public CFFL_FormFiller,
   FFL_TextFieldState m_State;
 };
 
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
+#endif  // FPDFSDK_FORMFILLER_CFFL_TEXTFIELD_H_
diff --git a/fpdfsdk/fsdk_annothandler.cpp b/fpdfsdk/fsdk_annothandler.cpp
index 6683284953..aef902c5a4 100644
--- a/fpdfsdk/fsdk_annothandler.cpp
+++ b/fpdfsdk/fsdk_annothandler.cpp
@@ -11,7 +11,7 @@
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index 38dd1f2d9f..f2d2c88fa4 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -14,7 +14,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cfdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_actionhandler.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
 #include "fpdfsdk/include/fsdk_define.h"
diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp
index 1ff1ca7ca3..91bafb10de 100644
--- a/fpdfsdk/fsdk_mgr.cpp
+++ b/fpdfsdk/fsdk_mgr.cpp
@@ -12,7 +12,7 @@
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "public/fpdf_ext.h"
diff --git a/pdfium.gyp b/pdfium.gyp
index fed93b7828..97d42c5914 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -803,24 +803,24 @@
       'target_name': 'formfiller',
       'type': 'static_library',
       'sources': [
-        'fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h',
-        'fpdfsdk/include/formfiller/FFL_CheckBox.h',
-        'fpdfsdk/include/formfiller/FFL_ComboBox.h',
-        'fpdfsdk/include/formfiller/FFL_FormFiller.h',
-        'fpdfsdk/include/formfiller/FFL_IFormFiller.h',
-        'fpdfsdk/include/formfiller/FFL_ListBox.h',
-        'fpdfsdk/include/formfiller/FFL_PushButton.h',
-        'fpdfsdk/include/formfiller/FFL_RadioButton.h',
-        'fpdfsdk/include/formfiller/FFL_TextField.h',
-        'fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp',
-        'fpdfsdk/formfiller/FFL_CheckBox.cpp',
-        'fpdfsdk/formfiller/FFL_ComboBox.cpp',
-        'fpdfsdk/formfiller/FFL_FormFiller.cpp',
-        'fpdfsdk/formfiller/FFL_IFormFiller.cpp',
-        'fpdfsdk/formfiller/FFL_ListBox.cpp',
-        'fpdfsdk/formfiller/FFL_PushButton.cpp',
-        'fpdfsdk/formfiller/FFL_RadioButton.cpp',
-        'fpdfsdk/formfiller/FFL_TextField.cpp',
+        'fpdfsdk/formfiller/cba_fontmap.cpp',
+        'fpdfsdk/formfiller/cba_fontmap.h',
+        'fpdfsdk/formfiller/cffl_checkbox.cpp',
+        'fpdfsdk/formfiller/cffl_checkbox.h',
+        'fpdfsdk/formfiller/cffl_combobox.cpp',
+        'fpdfsdk/formfiller/cffl_combobox.h',
+        'fpdfsdk/formfiller/cffl_formfiller.cpp',
+        'fpdfsdk/formfiller/cffl_formfiller.h',
+        'fpdfsdk/formfiller/cffl_iformfiller.cpp',
+        'fpdfsdk/formfiller/cffl_iformfiller.h',
+        'fpdfsdk/formfiller/cffl_listbox.cpp',
+        'fpdfsdk/formfiller/cffl_listbox.h',
+        'fpdfsdk/formfiller/cffl_pushbutton.cpp',
+        'fpdfsdk/formfiller/cffl_pushbutton.h',
+        'fpdfsdk/formfiller/cffl_radiobutton.cpp',
+        'fpdfsdk/formfiller/cffl_radiobutton.h',
+        'fpdfsdk/formfiller/cffl_textfield.cpp',
+        'fpdfsdk/formfiller/cffl_textfield.h',
       ],
     },
     {