3 files changed, 6 insertions, 10 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index 27e7a91cd5..1ddb99064f 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -40,7 +40,6 @@ class CPDFXFA_Document : public IXFA_DocProvider {
 
   void FXRect2PDFRect(const CFX_RectF& fxRectF, CPDF_Rect& pdfRect);
 
- public:
   virtual void SetChangeMark(IXFA_Doc* hDoc);
   virtual FX_BOOL GetChangeMark(IXFA_Doc* hDoc);
   // used in dynamic xfa, dwFlags refer to XFA_INVALIDATE_XXX macros.
@@ -220,16 +219,9 @@ class CPDFXFA_Document : public IXFA_DocProvider {
   IXFA_Doc* m_pXFADoc;
   IXFA_DocView* m_pXFADocView;
   CFX_ArrayTemplate<CPDFXFA_Page*> m_XFAPageList;
-
   CPDFSDK_Document* m_pSDKDoc;
   CPDFXFA_App* m_pApp;
-
-  CFX_MapByteStringToPtr m_XfaGlobalProperty;
-
-  CFX_MapByteStringToPtr m_ValueMap;
-
   IFXJS_Context* m_pJSContext;
-
   int m_iDocType;
 };
 
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 266c4589b0..c15681de96 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 #define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
+#include <map>
+
 #include "../../core/include/fxcrt/fx_basic.h"
 
 #define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
@@ -427,7 +429,7 @@ class CPDFSDK_AnnotHandlerMgr {
 
  private:
   CBA_AnnotHandlerArray m_Handlers;
-  CFX_MapByteStringToPtr m_mapType2Handler;
+  std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler;
   CPDFDoc_Environment* m_pApp;
 };
 
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h
index e881625f56..7f78bb6bcb 100644
--- a/fpdfsdk/include/javascript/global.h
+++ b/fpdfsdk/include/javascript/global.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 
+#include <map>
+
 #include "JS_Define.h"
 
 class CJS_GlobalData;
@@ -69,7 +71,7 @@ class JSGlobalAlternate : public CJS_EmbedObj {
   void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData);
 
  private:
-  CFX_MapByteStringToPtr m_mapGlobal;
+  std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal;
   CFX_WideString m_sFilePath;
   CJS_GlobalData* m_pGlobalData;
   CPDFDoc_Environment* m_pApp;