diff --git a/cocos/Android.mk b/cocos/Android.mk
index 70603cfd6a..1112b4abd9 100644
--- a/cocos/Android.mk
+++ b/cocos/Android.mk
@@ -132,6 +132,7 @@ base/ccUTF8.cpp \
 base/ccUtils.cpp \
 base/etc1.cpp \
 base/s3tc.cpp \
+base/ObjectFactory.cpp \
 renderer/CCBatchCommand.cpp \
 renderer/CCCustomCommand.cpp \
 renderer/CCGLProgram.cpp \
diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt
index 0b628db4ac..701c8ba5a6 100644
--- a/cocos/base/CMakeLists.txt
+++ b/cocos/base/CMakeLists.txt
@@ -41,4 +41,5 @@ set(COCOS_BASE_SRC
   base/ccUtils.cpp
   base/etc1.cpp
   base/s3tc.cpp
+  base/ObjectFactory.cpp
 )
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index c124991a0d..cfddcb1d99 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -36,7 +36,6 @@ CCInputDelegate.cpp \
 DictionaryHelper.cpp \
 CCSGUIReader.cpp \
 CCSSceneReader.cpp \
-ObjectFactory.cpp \
 TriggerBase.cpp \
 TriggerMng.cpp \
 TriggerObj.cpp \
diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt
index 7af96e4bbe..aeb1b0a265 100644
--- a/cocos/editor-support/cocostudio/CMakeLists.txt
+++ b/cocos/editor-support/cocostudio/CMakeLists.txt
@@ -30,7 +30,6 @@ set(CS_SRC
   DictionaryHelper.cpp
   CCSGUIReader.cpp
   CCSSceneReader.cpp
-  ObjectFactory.cpp
   TriggerBase.cpp
   TriggerMng.cpp
   TriggerObj.cpp
diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
index f87a9f3f36..bcd24723d6 100644
--- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
+++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj
@@ -42,7 +42,6 @@
     <ClCompile Include="..\CCTween.cpp" />
     <ClCompile Include="..\CCUtilMath.cpp" />
     <ClCompile Include="..\DictionaryHelper.cpp" />
-    <ClCompile Include="..\ObjectFactory.cpp" />
     <ClCompile Include="..\TriggerBase.cpp" />
     <ClCompile Include="..\TriggerMng.cpp" />
     <ClCompile Include="..\TriggerObj.cpp" />
@@ -207,4 +206,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
index 9172a7e571..655cb64627 100644
--- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
+++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
@@ -177,9 +177,6 @@
     <ClCompile Include="..\CCActionObject.cpp">
       <Filter>action</Filter>
     </ClCompile>
-    <ClCompile Include="..\ObjectFactory.cpp">
-      <Filter>trigger</Filter>
-    </ClCompile>
     <ClCompile Include="..\TriggerBase.cpp">
       <Filter>trigger</Filter>
     </ClCompile>
@@ -417,4 +414,4 @@
       <Filter>reader\WidgetReader\PageViewReader</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj
index 7b156dd888..8c3b1e5b08 100644
--- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj
+++ b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj
@@ -194,7 +194,6 @@
     <ClCompile Include="..\CCTween.cpp" />
     <ClCompile Include="..\CCUtilMath.cpp" />
     <ClCompile Include="..\DictionaryHelper.cpp" />
-    <ClCompile Include="..\ObjectFactory.cpp" />
     <ClCompile Include="..\TriggerBase.cpp" />
     <ClCompile Include="..\TriggerMng.cpp" />
     <ClCompile Include="..\TriggerObj.cpp" />
@@ -283,4 +282,4 @@
     <ClInclude Include="..\WidgetReader\WidgetReaderProtocol.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters
index cba46f39b9..18070a5586 100644
--- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters
+++ b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters
@@ -177,9 +177,6 @@
     <ClCompile Include="..\CCActionObject.cpp">
       <Filter>action</Filter>
     </ClCompile>
-    <ClCompile Include="..\ObjectFactory.cpp">
-      <Filter>trigger</Filter>
-    </ClCompile>
     <ClCompile Include="..\TriggerBase.cpp">
       <Filter>trigger</Filter>
     </ClCompile>
@@ -419,4 +416,4 @@
     </ClInclude>
     <ClInclude Include="pch.h" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cocos/ui/UIVideoPlayerAndroid.cpp b/cocos/ui/UIVideoPlayerAndroid.cpp
index 2c8073c68c..1ccc94469e 100644
--- a/cocos/ui/UIVideoPlayerAndroid.cpp
+++ b/cocos/ui/UIVideoPlayerAndroid.cpp
@@ -30,6 +30,9 @@
 #include <jni.h>
 #include <string>
 #include "jni/JniHelper.h"
+#include "base/CCDirector.h"
+#include "CCGLView.h"
+#include "base/CCEventListenerKeyboard.h"
 
 //-----------------------------------------------------------------------------------------------------------
 #define  CLASS_NAME "org/cocos2dx/lib/Cocos2dxVideoHelper"
diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json
index 7ffef77193..a41edf3aee 100644
--- a/templates/cocos2dx_files.json
+++ b/templates/cocos2dx_files.json
@@ -317,6 +317,7 @@
         "cocos/base/CCTouch.cpp", 
         "cocos/base/CCTouch.h", 
         "cocos/base/CCUserDefault.cpp", 
+        "cocos/base/ObjectFactory.cpp", 
         "cocos/base/CCUserDefault.h", 
         "cocos/base/CCUserDefault.mm", 
         "cocos/base/CCUserDefaultAndroid.cpp", 
@@ -4326,4 +4327,4 @@
         "tools/tolua/cocos2dx_ui.ini", 
         "tools/tolua/genbindings.py"
     ]
-}
\ No newline at end of file
+}