diff --git a/api/@internal/ets/index.d.ts b/api/@internal/ets/index.d.ts
index 4a9e2b6b33809e76eb91f12c8ba4779d2bb51a1b..947b5ac4cdeb51711915004f8c89657e01fd0e98 100644
--- a/api/@internal/ets/index.d.ts
+++ b/api/@internal/ets/index.d.ts
@@ -13,5 +13,4 @@
  * limitations under the License.
  */
 
-export * from './global';
 export * from './lifecycle';
diff --git a/api/@ohos.account.appAccount.d.ts b/api/@ohos.account.appAccount.d.ts
index a08f33eac576ebfa78272b0e913b12dacecb679f..959be0441168308e414abd73a1b0ba0c23e4cffb 100644
--- a/api/@ohos.account.appAccount.d.ts
+++ b/api/@ohos.account.appAccount.d.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import {AsyncCallback} from "./basic";
+import {AsyncCallback, Callback} from "./basic";
 import {Want} from "./ability/want";
 
 /**
diff --git a/api/@ohos.account.osAccount.d.ts b/api/@ohos.account.osAccount.d.ts
index 1a4f81c7cbd30d6e0c01811d595ee5659b096729..46c221fc1cb30269e289f06707849e70a5bee4dc 100644
--- a/api/@ohos.account.osAccount.d.ts
+++ b/api/@ohos.account.osAccount.d.ts
@@ -14,7 +14,7 @@
  */
 
 import distributedAccount from './@ohos.account.distributedAccount'
-import {AsyncCallback} from "./basic";
+import {AsyncCallback, Callback} from "./basic";
 
 /**
  * This module provides the capability to manage os accounts.
diff --git a/api/@ohos.app.abilityManager.d.ts b/api/@ohos.app.abilityManager.d.ts
index 9b430de3ca7765df86929782bae19ee36ffc4cc4..e7b7b7ed039ab1daf632552cc56a604a665447c8 100644
--- a/api/@ohos.app.abilityManager.d.ts
+++ b/api/@ohos.app.abilityManager.d.ts
@@ -16,7 +16,6 @@
 import { AsyncCallback } from './basic';
 import { AbilityMissionInfo } from './app/abilityMissionInfo';
 import { ActiveProcessInfo } from './app/activeProcessInfo';
-import { MissionSnapshot } from './app/missionSnapshot';
 
 /**
  * This module provides the capability to manage abilities and obtaining system task information.
diff --git a/api/@ohos.application.Ability.d.ts b/api/@ohos.application.Ability.d.ts
index 90e2439bb238354def06438ab94389f2d615a28c..dc0efcad254fa340ee4da77101a6b2ca159ea9fb 100755
--- a/api/@ohos.application.Ability.d.ts
+++ b/api/@ohos.application.Ability.d.ts
@@ -18,7 +18,7 @@ import AbilityContext from "./application/AbilityContext";
 import Want from './@ohos.application.Want';
 import window from './@ohos.window';
 import { Configuration } from './@ohos.application.Configuration';
-import rpc from '/@ohos.rpc';
+import rpc from './@ohos.rpc';
 
 /**
  * The interface of a Caller.
@@ -67,7 +67,7 @@ import rpc from '/@ohos.rpc';
      * return Sequenceable data
      * @StageModelOnly
      */
-     onRelease(callback: function): void;
+     onRelease(callback: Function): void;
  }
 
  /**
@@ -88,7 +88,7 @@ import rpc from '/@ohos.rpc';
      * @sysCap AAFwk
      * @StageModelOnly
      */
-     on(method: string, callback: function): void;
+     on(method: string, callback: Function): void;
 
      /**
      * Unregister data listener callback.
diff --git a/api/@ohos.bundle.innerBundleManager.d.ts b/api/@ohos.bundle.innerBundleManager.d.ts
index aba733ae16560ca6561d05becfb9b85429ab205d..2a6912a9f4e402dbb5a2dec9815f751de66a8b26 100644
--- a/api/@ohos.bundle.innerBundleManager.d.ts
+++ b/api/@ohos.bundle.innerBundleManager.d.ts
@@ -14,7 +14,6 @@
  */
 
 import { AsyncCallback, Callback } from './basic';
-import { BundleStatusCallback } from './bundle/bundleStatusCallback';
 import { LauncherAbilityInfo} from './bundle/launcherAbilityInfo';
 import { ShortcutInfo } from './bundle/shortcutInfo';
 
diff --git a/api/@ohos.fileManager.d.ts b/api/@ohos.fileManager.d.ts
index f6df405e7ed3a6456173db27dc557aa37e8ff197..b16aa766f0563d0bbab0b5eb2e9015cdd0a0fcff 100644
--- a/api/@ohos.fileManager.d.ts
+++ b/api/@ohos.fileManager.d.ts
@@ -44,7 +44,7 @@ declare namespace filemanager {
  * @throws {TypedError} Parameter check failed
  */
 declare function listFile(path: string, type: string, options?: {dev?: DevInfo, offset?: number, count?: number}): Promise<FileInfo[]>;
-declare function listFile(path: string, type: string, options?: {dev?: DevInfo, offset?: number, count?: number}, AsyncCallback<FileInfo[]>): void;
+declare function listFile(path: string, type: string, options: {dev?: DevInfo, offset?: number, count?: number}, callback: AsyncCallback<FileInfo[]>): void;
 
 /**
  * getRoot.
@@ -61,7 +61,7 @@ declare function listFile(path: string, type: string, options?: {dev?: DevInfo,
  * @throws {TypedError} Parameter check failed
  */
 declare function getRoot(options?: {dev?: DevInfo}): Promise<FileInfo[]>;
-declare function getRoot(options?: {dev?: DevInfo}, callback: AsyncCallback<FileInfo[]>): void;
+declare function getRoot(options: {dev?: DevInfo}, callback: AsyncCallback<FileInfo[]>): void;
 
 /**
  * createFile.
@@ -80,7 +80,7 @@ declare function getRoot(options?: {dev?: DevInfo}, callback: AsyncCallback<File
  * @throws {TypedError} Parameter check failed
  */
 declare function createFile(path: string, filename: string, options?: {dev?: DevInfo}): Promise<string>;
-declare function createFile(path: string, filename: string, options?: {dev?: DevInfo}, callback: AsyncCallback<string>): void;
+declare function createFile(path: string, filename: string, options: {dev?: DevInfo}, callback: AsyncCallback<string>): void;
 
 /**
  * FileInfo
diff --git a/api/@ohos.geolocation.d.ts b/api/@ohos.geolocation.d.ts
index ab24bda4c1ab7280efc24dab72d40430644ead96..3e251ced27c609aa2489efa1ceade33bcd470bb8 100644
--- a/api/@ohos.geolocation.d.ts
+++ b/api/@ohos.geolocation.d.ts
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AsyncCallback, Callback } from './basic.d.ts';
-import WantAgent from '@ohos.wantAgent';
+import { AsyncCallback, Callback } from './basic';
+import { WantAgent } from './@ohos.wantAgent';
 
  /**
  * Provides interfaces for initiating location requests, ending the location service,
diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts
index 33f0948cf3a19bc8bfc99e54c59306444ea16e0f..b03200f057559d368b219f2e55cb364255624de1 100644
--- a/api/@ohos.multimedia.camera.d.ts
+++ b/api/@ohos.multimedia.camera.d.ts
@@ -14,7 +14,6 @@
  */
 
 import {ErrorCallback, AsyncCallback} from './basic';
-import Context from './@ohos.ability';
 
 /**
  * @name camera
diff --git a/api/@ohos.multimedia.mediaLibrary.d.ts b/api/@ohos.multimedia.mediaLibrary.d.ts
index 72b7e28cf1251fc9e7230082403277c54ca0a1ab..5c6b36f9bbf1a49f62f79894fda001f02d6a6ba8 100644
--- a/api/@ohos.multimedia.mediaLibrary.d.ts
+++ b/api/@ohos.multimedia.mediaLibrary.d.ts
@@ -14,7 +14,6 @@
  */
 
 import { AsyncCallback } from './basic';
-import Context from './@ohos.ability';
 import image from './@ohos.multimedia.image';
 
 /**
diff --git a/api/@ohos.runninglock.d.ts b/api/@ohos.runninglock.d.ts
index acd9cfae45c2961617cc5275eccd48fdf6069a89..e68099a21f0885293750578fefcb22186360e11f 100644
--- a/api/@ohos.runninglock.d.ts
+++ b/api/@ohos.runninglock.d.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import {AsyncCallback} from './basic.d.ts';
+import {AsyncCallback} from './basic';
 
 /**
  * Provides a mechanism to prevent the system from hibernating so that the applications can run in the background or
diff --git a/api/@ohos.security.huks.d.ts b/api/@ohos.security.huks.d.ts
index 4245e590019cd5ebb8d210a38d36356cbdf7da93..80b3e1de89d58e28b0174e01e8b6d3c9ac6f2182 100755
--- a/api/@ohos.security.huks.d.ts
+++ b/api/@ohos.security.huks.d.ts
@@ -101,8 +101,8 @@ declare namespace huks {
      * @param token Indicates the value of token.
      * @param options Indicates the properties of the update operation.
      */
-    function update(handle: number, token?: Uint8Array, options: HuksOptions, callback: AsyncCallback<HuksResult>) : void;
-    function update(handle: number, token?: Uint8Array, options: HuksOptions,) : Promise<HuksResult>;
+    function update(handle: number, token?: Uint8Array, options?: HuksOptions, callback?: AsyncCallback<HuksResult>) : void;
+    function update(handle: number, token?: Uint8Array, options?: HuksOptions) : Promise<HuksResult>;
 
     /**
      * Finish Operation.
@@ -122,7 +122,7 @@ declare namespace huks {
      * @param options Indicates the properties of the abort operation.
      */
     function abort(handle: number, options: HuksOptions, callback: AsyncCallback<HuksResult>) : void;
-    function abort(handle: number, options: HuksOptions) : Promise(HuksResult>;
+    function abort(handle: number, options: HuksOptions) : Promise<HuksResult>;
 
     /**
      * Get the sdk version.
@@ -354,7 +354,7 @@ declare namespace huks {
         HUKS_SEND_TYPE_SYNC = 1,
     }
 
-    declare enum HuksTagType {
+    export enum HuksTagType {
         HUKS_TAG_TYPE_INVALID = 0 << 28,
         HUKS_TAG_TYPE_INT = 1 << 28,
         HUKS_TAG_TYPE_UINT = 2 << 28,
diff --git a/api/@ohos.update.d.ts b/api/@ohos.update.d.ts
index 0620034b5dd6b219688839ad75fd9a8f9f577281..581e11e287761b29fc8d20585929e95e1648d335 100644
--- a/api/@ohos.update.d.ts
+++ b/api/@ohos.update.d.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { AsyncCallback, BussinessError } from "./basic";
+import { AsyncCallback } from "./basic";
 
 /**
  * A static class to do update for device.
@@ -281,7 +281,7 @@ declare namespace update {
          *
          * @since 6
          */
-        installMode: INSTALL_MODE;
+        installMode: InstallMode;
 
         /**
          * Auto installation time interval
diff --git a/api/@ohos.util.LightWeightSet.d.ts b/api/@ohos.util.LightWeightSet.d.ts
index 27f078499b5d396da9cee65460b42ac891d53be7..31f26e9c468fa48aa1fd71b0a660416a1cc153d2 100644
--- a/api/@ohos.util.LightWeightSet.d.ts
+++ b/api/@ohos.util.LightWeightSet.d.ts
@@ -12,7 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-declare class LightWeightSet<T> {
+import LightWeightMap from './@ohos.util.LightWeightMap';
+
+declare class LightWeightSet<K, V> {
   /**
    * A constructor used to create a LightWeightSet object.
    * @since 8
@@ -32,7 +34,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  add(value: T): boolean;
+  add(value: V): boolean;
   /**
    * Adds all the objects in a specified LightWeightSet container to the current LightWeightSet container
    * @param set the Map object to provide the added element
@@ -40,7 +42,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  addAll(set: LightWeightMap<T>): boolean;
+  addAll(set: LightWeightMap<K, V>): boolean;
   /**
    * Returns whether this set has all the object in a specified set
    * @param set the Set object to compare
@@ -48,7 +50,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  hasAll(set: LightWeightSet<T>): boolean;
+  hasAll(set: LightWeightSet<K, V>): boolean;
   /**
    * Checks whether an LightWeightSet container has a specified key
    * @param key need to determine whether to include the key
@@ -56,7 +58,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  has(key: T): boolean;
+  has(key: K): boolean;
   /**
    * Checks whether an the objects of an LightWeighSet containeer are of the same type as a specified Object LightWeightSet
    * @param obj need to determine whether to include the obj
@@ -80,7 +82,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  getIndexOf(key: T): number;
+  getIndexOf(key: K): number;
   /**
    * Deletes an object of a specified Object type from an LightWeightSet container
    * @param key  Target to be deleted
@@ -88,7 +90,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  remove(key: T): T;
+  remove(key: K): K;
   /**
    * Deletes an object at the loaction identified by index from an LightWeightSet container
    * @param index  Target subscript for search
@@ -110,14 +112,14 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  forEach(callbackfn: (value?: T, key?: T, map?: LightWeightSet<T>) => void,
+  forEach(callbackfn: (value?: V, key?: K, map?: LightWeightSet<K, V>) => void,
   thisArg?: Object): void;
   /**
    * returns an ES6 iterator.Each item of the iterator is a Javascript Object
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  [Symbol.iterator](): IterableIterator<T>;
+  [Symbol.iterator](): IterableIterator<[K, V]>;
   /**
    * Obtains a string that contains all the keys and values in an LightWeightSet container
    * @since 8
@@ -129,7 +131,7 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  toArray(): Array<T>;
+  toArray(): Array<V>;
   /**
    * Obtains the object at the location  identified by index in an LightWeightSet container
    * @param index Target subscript for search
@@ -137,19 +139,19 @@ declare class LightWeightSet<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  getValueAt(index: number): T;
+  getValueAt(index: number): V;
   /**
    * Returns a ES6 iterator of the values contained in this Set
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  values(): IterableIterator<T>;
+  values(): IterableIterator<V>;
   /**
    * Returns a Iterator object that contains the [key, value] pairs for each element in the Set object in insertion order
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  entries(): IterableIterator<[T, T]>;
+  entries(): IterableIterator<[K, V]>;
 }
 
 export default LightWeightSet;
diff --git a/api/@ohos.util.LinkedList.d.ts b/api/@ohos.util.LinkedList.d.ts
index 14333ffb644f2fdc6651a830e83b46f8061daa83..c5d4f2939a4900272b09dfd38859379ce930a3ba 100644
--- a/api/@ohos.util.LinkedList.d.ts
+++ b/api/@ohos.util.LinkedList.d.ts
@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import ArrayList from './@ohos.util.ArrayList';
+
 declare class LinkedList<T> {
   /**
    * Gets the element number of the LinkedList. This is a number one higher than the highest index in the linkedlist.
diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts
index 89d90ba06e99083ff97f4425f058701277c6a698..cbe110a818b135e650fcfc1eae9632f4ee211297 100644
--- a/api/@ohos.util.List.d.ts
+++ b/api/@ohos.util.List.d.ts
@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import ArrayList from './@ohos.util.ArrayList';
+
 declare class List<T> {
   /**
    * A constructor used to create a List object.
diff --git a/api/@ohos.util.PlainArray.d.ts b/api/@ohos.util.PlainArray.d.ts
index 55495dd9c1384f227c2fcf08e6d34c5b08a696af..6b6ed7f8613042ce6d7beebf457388d6a765f6fd 100644
--- a/api/@ohos.util.PlainArray.d.ts
+++ b/api/@ohos.util.PlainArray.d.ts
@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import LightWeightMap from './@ohos.util.LightWeightMap';
+
 declare class PlainArray<T> {
   /**
    * A constructor used to create a PlainArray object.
@@ -145,7 +147,7 @@ declare class PlainArray<T> {
    * @since 8
    * @syscap SystemCapability.Utils.Lang
    */
-  forEach(callbackfn: (value?: V, key?: K, map?: LightWeightMap<K, V>) => void,
+  forEach(callbackfn: (value?: T, key?: number, map?: LightWeightMap<number, T>) => void,
   thisArg?: Object): void;
   /**
    * returns an iterator.Each item of the iterator is a Javascript Object
diff --git a/api/@ohos.util.d.ts b/api/@ohos.util.d.ts
index 4ec1ce1808fc942d2bd3cfe096227443605a733b..eca4110f99ab2e846f6f40348dcba05a101d8266 100644
--- a/api/@ohos.util.d.ts
+++ b/api/@ohos.util.d.ts
@@ -250,7 +250,7 @@ declare namespace util {
         toString(): string;
     }
 
-    class LruBuffer {
+    class LruBuffer<K, V> {
         /**
          * Default constructor used to create a new LruBuffer instance with the default capacity of 64.
          * @since 8
diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts
index 868d38934dcaecbf529b13934f6d49f7003b2166..caebe8a83e85b8aeca778f315d1148a5f690e301 100644
--- a/api/@ohos.window.d.ts
+++ b/api/@ohos.window.d.ts
@@ -14,7 +14,6 @@
 */
 import { AsyncCallback, Callback } from './basic' ;
 import { Context } from  './app/context';
-import { ContenStorage } from './@internal/component/ets/stateManagement'
 /**
  * Window manager.
  * @syscap SystemCapability.WindowManager.WindowManager.Core
@@ -549,7 +548,7 @@ declare namespace window {
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @since 8
      */
-    loadContent(path: string, storage: ContenStorage, callback: AsyncCallback<void>): void;
+    loadContent(path: string, storage: ContentStorage, callback: AsyncCallback<void>): void;
 
     /**
      * Loads content
@@ -565,7 +564,7 @@ declare namespace window {
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @since 7
      */
-    loadContent(path: string, storage?: ContenStorage): Promise<void>;
+    loadContent(path: string, storage?: ContentStorage): Promise<void>;
 
     /**
      * Checks whether the window is displayed
@@ -702,7 +701,7 @@ declare namespace window {
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @since 9
      */
-    loadContent(path: string, storage: ContenStorage, callback: AsyncCallback<void>): void;
+    loadContent(path: string, storage: ContentStorage, callback: AsyncCallback<void>): void;
     /**
      * Loads content
      * @param path path of the page to which the content will be loaded
@@ -716,7 +715,7 @@ declare namespace window {
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @since 9
      */
-    loadContent(path: string, storage?: ContenStorage): Promise<void>;
+    loadContent(path: string, storage?: ContentStorage): Promise<void>;
     /**
      * window stage event callback on.
      * @since 9
diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts
index 1604b9bf5e0797c5dc51dcd8842a15d40fd95c81..365203f761d8a6c816f0d8f6b52d3e0a2026905b 100644
--- a/api/ability/connectOptions.d.ts
+++ b/api/ability/connectOptions.d.ts
@@ -30,7 +30,7 @@ export interface ConnectOptions {
    * @param elementName The element name of the service ability
    * @param remoteObject The remote object instance
    */
-  onConnect: (elementName: ElementName, remoteObject: RemoteObject) => void;
+  onConnect: (elementName: ElementName, remoteObject: rpc.RemoteObject) => void;
 
   /**
    * The callback interface was disconnect successfully.
diff --git a/api/application/BaseContext.d.ts b/api/application/BaseContext.d.ts
index 7b63cc832dff0ff702a8ccdda8003be62412b6a4..9d39c1f61042561c30d9cb63ddf56c17c80dec44 100644
--- a/api/application/BaseContext.d.ts
+++ b/api/application/BaseContext.d.ts
@@ -21,7 +21,7 @@
  * @sysCap SystemCapability.Ability.AbilityRuntime.Core
  * @permission N/A
  */
-export default interface BaseContext {
+export default abstract class BaseContext {
     /**
      * Indicates the context is FA Mode or Stage Mode.
      *
diff --git a/api/common/@system.app.d.ts b/api/common/@system.app.d.ts
index dc37ca1fd62908e94774e9dc46e59bc0aeb7f72a..98cbefd0a8a007dd6b270370d2aee19df73f9aed 100644
--- a/api/common/@system.app.d.ts
+++ b/api/common/@system.app.d.ts
@@ -13,6 +13,8 @@
  * limitations under the License.
  */
 
+import { RequestFullWindowOptions } from '../tablet/@system.app';
+
 /**
  * @devices tv, phone, tablet, wearable, liteWearable, smartVision
  */
diff --git a/api/phone/@ohos.process.d.ts b/api/phone/@ohos.process.d.ts
index 3f690ab00ccff5869e8377255744cb6161532d68..0e61809d4e4da18096db4c3436ccd02ba319363a 100644
--- a/api/phone/@ohos.process.d.ts
+++ b/api/phone/@ohos.process.d.ts
@@ -72,12 +72,12 @@ declare namespace process {
      */
     function kill(signal: number, pid: number): boolean;
 
-    readonly getEgid: number;
-    readonly getEuid: number;
-    readonly getGid: number;
-    readonly getUid: number;
-    readonly getGroups: number[];
-    readonly getPid: number;
-    readonly getPpid: number;
+    function getEgid(): number;
+    function getEuid(): number;
+    function getGid(): number;
+    function getUid(): number;
+    function getGroups(): number[];
+    function getPid(): number;
+    function getPpid(): number;
 }
 export default process;
\ No newline at end of file