5 files changed, 12 insertions, 9 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
index bdc6724f65..6edd6bdd85 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
@@ -239,9 +239,9 @@ void CPWL_ComboBox::SetText(const FX_WCHAR* text) {
     m_pEdit->SetText(text);
 }
 
-void CPWL_ComboBox::AddString(const FX_WCHAR* string) {
+void CPWL_ComboBox::AddString(const FX_WCHAR* str) {
   if (m_pList)
-    m_pList->AddString(string);
+    m_pList->AddString(str);
 }
 
 int32_t CPWL_ComboBox::GetSelect() const {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 0b3887b413..c4a5bf03fd 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -6,6 +6,8 @@
 
 #include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 
+#include <vector>
+
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxcrt/fx_xml.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
index c8e738a7ca..2c0b79d2f1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
@@ -391,9 +391,9 @@ CFX_FloatRect CPWL_ListBox::GetFocusRect() const {
   return CPWL_Wnd::GetFocusRect();
 }
 
-void CPWL_ListBox::AddString(const FX_WCHAR* string) {
+void CPWL_ListBox::AddString(const FX_WCHAR* str) {
   if (m_pList) {
-    m_pList->AddString(string);
+    m_pList->AddString(str);
   }
 }
 
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index 1933d564f4..7ba6f6ad66 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
@@ -1507,6 +1507,6 @@ CFX_WideString CPWL_Note::GetReplyString() const {
   return m_sReplyString;
 }
 
-void CPWL_Note::SetReplyString(const CFX_WideString& string) {
-  m_sReplyString = string;
+void CPWL_Note::SetReplyString(const CFX_WideString& str) {
+  m_sReplyString = str;
 }
diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
index 6b3940de28..ffb4461878 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
@@ -4,9 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "fpdfsdk/include/pdfwindow/PWL_Signature.h"
+
 #include "fpdfsdk/include/pdfwindow/PWL_Icon.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Label.h"
-#include "fpdfsdk/include/pdfwindow/PWL_Signature.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
@@ -86,8 +87,8 @@ void CPWL_Signature::SetText(const FX_WCHAR* sText) {
   RePosChildWnd();
 }
 
-void CPWL_Signature::SetDescription(const FX_WCHAR* string) {
-  m_pDescription->SetText(string);
+void CPWL_Signature::SetDescription(const FX_WCHAR* str) {
+  m_pDescription->SetText(str);
 
   RePosChildWnd();
 }