4 files changed, 9 insertions, 1 deletions
diff --git a/xfa/src/fxfa/app/xfa_fftextedit.cpp b/xfa/src/fxfa/app/xfa_fftextedit.cpp
index 5457324d9d..f828939327 100644
--- a/xfa/src/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/app/xfa_fftextedit.cpp
@@ -6,6 +6,8 @@
 
 #include "xfa/src/fxfa/app/xfa_fftextedit.h"
 
+#include <vector>
+
 #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/lightwidget/datetimepicker.h"
diff --git a/xfa/src/fxfa/app/xfa_fftextedit.h b/xfa/src/fxfa/app/xfa_fftextedit.h
index f961e5a4da..a87300dec0 100644
--- a/xfa/src/fxfa/app/xfa_fftextedit.h
+++ b/xfa/src/fxfa/app/xfa_fftextedit.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FXFA_APP_XFA_FFTEXTEDIT_H_
 #define XFA_SRC_FXFA_APP_XFA_FFTEXTEDIT_H_
 
+#include <vector>
+
 #include "xfa/src/fxfa/app/xfa_fffield.h"
 
 class CXFA_FFTextEdit : public CXFA_FFField {
diff --git a/xfa/src/fxfa/app/xfa_ffwidget.cpp b/xfa/src/fxfa/app/xfa_ffwidget.cpp
index 7afa6fa12b..cc947b0ad4 100644
--- a/xfa/src/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidget.cpp
@@ -825,7 +825,8 @@ void XFA_DrawImage(CFX_Graphics* pGS,
   }
   pRenderDevice->RestoreState();
 }
-const static uint8_t g_inv_base64[128] = {
+
+static const uint8_t g_inv_base64[128] = {
     255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62,  255,
@@ -836,6 +837,7 @@ const static uint8_t g_inv_base64[128] = {
     34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,
     49,  50,  51,  255, 255, 255, 255, 255,
 };
+
 static uint8_t* XFA_RemoveBase64Whitespace(const uint8_t* pStr, int32_t iLen) {
   uint8_t* pCP;
   int32_t i = 0, j = 0;
diff --git a/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp
index 62f21fa644..bea7586180 100644
--- a/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp
@@ -6,6 +6,8 @@
 
 #include "xfa/src/fxfa/app/xfa_ffwidgethandler.h"
 
+#include <vector>
+
 #include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
 #include "xfa/src/fxfa/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/app/xfa_ffdocview.h"