diff --git a/extensions/AssetsManager/AssetsManager.h b/extensions/AssetsManager/AssetsManager.h
index 6523e73473..46f50ebe71 100644
--- a/extensions/AssetsManager/AssetsManager.h
+++ b/extensions/AssetsManager/AssetsManager.h
@@ -213,6 +213,10 @@ public:
     virtual void onSuccess() {};
 };
 
+// Deprecated declaration
+CC_DEPRECATED_ATTRIBUTE typedef AssetsManager CCAssetsManager;
+CC_DEPRECATED_ATTRIBUTE typedef AssetsManagerDelegateProtocol CCAssetsManagerDelegateProtocol;
+
 NS_CC_EXT_END;
 
 #endif /* defined(__AssetsManager__) */
diff --git a/extensions/CCBReader/CCNodeLoaderLibrary.h b/extensions/CCBReader/CCNodeLoaderLibrary.h
index 15a51d0548..9abd64b660 100644
--- a/extensions/CCBReader/CCNodeLoaderLibrary.h
+++ b/extensions/CCBReader/CCNodeLoaderLibrary.h
@@ -33,7 +33,7 @@ public:
     CC_DEPRECATED_ATTRIBUTE void registerDefaultCCNodeLoaders() { registerDefaultNodeLoaders(); }
     CC_DEPRECATED_ATTRIBUTE void registerCCNodeLoader(const char * pClassName, NodeLoader * pNodeLoader) { registerNodeLoader(pClassName, pNodeLoader); };
     CC_DEPRECATED_ATTRIBUTE void unregisterCCNodeLoader(const char * pClassName) { unregisterNodeLoader(pClassName); };
-    CC_DEPRECATED_ATTRIBUTE NodeLoader * getCCNodeLoader(const char * pClassName) { getNodeLoader(pClassName); } ;
+    CC_DEPRECATED_ATTRIBUTE NodeLoader * getCCNodeLoader(const char * pClassName) { return getNodeLoader(pClassName); };
     
 public:
     static NodeLoaderLibrary * getInstance();
diff --git a/extensions/CCDeprecated-ext.h b/extensions/CCDeprecated-ext.h
index 6f73471d03..8c93828447 100644
--- a/extensions/CCDeprecated-ext.h
+++ b/extensions/CCDeprecated-ext.h
@@ -79,8 +79,7 @@ CC_DEPRECATED_ATTRIBUTE typedef NodeLoaderLibrary CCNodeLoaderLibrary;
 CC_DEPRECATED_ATTRIBUTE typedef MenuItemLoader CCMenuItemLoader;
 CC_DEPRECATED_ATTRIBUTE typedef LayerColorLoader CCLayerColorLoader;
 CC_DEPRECATED_ATTRIBUTE typedef LabelTTFLoader CCLabelTTFLoader;
-CC_DEPRECATED_ATTRIBUTE typedef AssetsManager CCAssetsManager;
-CC_DEPRECATED_ATTRIBUTE typedef AssetsManagerDelegateProtocol CCAssetsManagerDelegateProtocol;
+
 
 #if CC_ENABLE_BOX2D_INTEGRATION || CC_ENABLE_CHIPMUNK_INTEGRATION
 CC_DEPRECATED_ATTRIBUTE typedef PhysicsSprite CCPhysicsSprite;
diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h
index cce335b6e2..716f269065 100644
--- a/extensions/cocos-ext.h
+++ b/extensions/cocos-ext.h
@@ -3,8 +3,6 @@
 
 #include "ExtensionMacros.h"
 
-#include "AssetsManager/AssetsManager.h"
-
 #include "CCBReader/CCBFileLoader.h"
 #include "CCBReader/CCBMemberVariableAssigner.h"
 #include "CCBReader/CCBReader.h"
@@ -41,6 +39,7 @@
 #include "network/HttpRequest.h"
 #include "network/HttpResponse.h"
 #include "network/HttpClient.h"
+#include "network/WebSocket.h"
 #include "network/SocketIO.h"
 
 // Physics integration
diff --git a/extensions/network/WebSocket.cpp b/extensions/network/WebSocket.cpp
index b979776da6..b55d2b34cc 100644
--- a/extensions/network/WebSocket.cpp
+++ b/extensions/network/WebSocket.cpp
@@ -28,12 +28,15 @@
  ****************************************************************************/
 
 #include "WebSocket.h"
+
 #include <thread>
 #include <mutex>
 #include <queue>
 #include <signal.h>
 #include <errno.h>
 
+#include "libwebsockets.h"
+
 NS_CC_EXT_BEGIN
 
 class WsMessage
@@ -444,7 +447,7 @@ void WebSocket::onSubThreadEnded()
 
 int WebSocket::onSocketCallback(struct libwebsocket_context *ctx,
                      struct libwebsocket *wsi,
-                     enum libwebsocket_callback_reasons reason,
+                     int reason,
                      void *user, void *in, size_t len)
 {
 	//CCLOG("socket callback for %d reason", reason);
diff --git a/extensions/network/WebSocket.h b/extensions/network/WebSocket.h
index 1dc262077b..d27afe7736 100644
--- a/extensions/network/WebSocket.h
+++ b/extensions/network/WebSocket.h
@@ -32,9 +32,12 @@
 
 #include "ExtensionMacros.h"
 #include "cocos2d.h"
-#include "libwebsockets.h"
 #include <list>
 
+struct libwebsocket;
+struct libwebsocket_context;
+struct libwebsocket_protocols;
+
 NS_CC_EXT_BEGIN
 
 class WsThreadHelper;
@@ -132,7 +135,7 @@ private:
     friend class WebSocketCallbackWrapper;
     int onSocketCallback(struct libwebsocket_context *ctx,
                          struct libwebsocket *wsi,
-                         enum libwebsocket_callback_reasons reason,
+                         int reason,
                          void *user, void *in, size_t len);
     
 private: