diff --git a/cleanup-code.sh b/cleanup-code.sh
index b3c425de..624cdfaf 100755
--- a/cleanup-code.sh
+++ b/cleanup-code.sh
@@ -153,7 +153,14 @@ tab2space() {
 # sed -i 's/\<Sets\>/Set/g' `grep '\<Sets\>' -rl include/ src/`
 # sed -i 's/\<Retrieves\>/Retrieve/g' `grep '\<Retrieves\>' -rl include/ src/`
 
-#sed -i 's/\<Determines\>/Determine/g' `grep '\<Determines\>' -rl include/ src/`
-sed -i 's/\<Checks\>/Check/g' `grep '\<Checks\>' -rl include/ src/`
+# sed -i 's/\<Determines\>/Determine/g' `grep '\<Determines\>' -rl include/ src/`
+# sed -i 's/\<Checks\>/Check/g' `grep '\<Checks\>' -rl include/ src/`
+
+sed -i 's/\<SetWindowExStyle\>/gui_SetWindowExStyle/g' `grep '\<SetWindowExStyle\>' -rl include/ src/`
+sed -i 's/\<AddNewControlClass\>/gui_AddNewControlClass/g' `grep '\<AddNewControlClass\>' -rl include/ src/`
+sed -i 's/\<SetCtrlClassAddData\>/gui_SetCtrlClassAddData/g' `grep '\<SetCtrlClassAddData\>' -rl include/ src/`
+sed -i 's/\<GetCtrlClassAddData\>/gui_GetCtrlClassAddData/g' `grep '\<GetCtrlClassAddData\>' -rl include/ src/`
+
+# sed -i 's/\<AAA\>/gui_AAA/g' `grep '\<AAA\>' -rl include/ src/`
 
 exit 0
diff --git a/src/control/bidiedit.c b/src/control/bidiedit.c
index 8cfd773e..c1992692 100644
--- a/src/control/bidiedit.c
+++ b/src/control/bidiedit.c
@@ -114,7 +114,7 @@ BOOL RegisterBIDISLEditControl (void)
 #endif
     WndClass.WinProc     = SLEditCtrlProc;
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     return TRUE;
diff --git a/src/control/button.c b/src/control/button.c
index 4aca9c7c..09c2bbf6 100644
--- a/src/control/button.c
+++ b/src/control/button.c
@@ -675,7 +675,7 @@ BOOL RegisterButtonControl (void)
 #endif
     WndClass.WinProc     = ButtonCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /**
diff --git a/src/control/combobox.c b/src/control/combobox.c
index 3af614d6..5dd919b8 100644
--- a/src/control/combobox.c
+++ b/src/control/combobox.c
@@ -102,7 +102,7 @@ BOOL RegisterComboBoxControl (void)
 #endif
     WndClass.WinProc     = ComboBoxCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 static LRESULT AutoSpinEditBoxProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
diff --git a/src/control/edit.c b/src/control/edit.c
index 7050337a..92d12088 100644
--- a/src/control/edit.c
+++ b/src/control/edit.c
@@ -123,12 +123,12 @@ BOOL RegisterSLEditControl (void)
 #endif
     WndClass.WinProc     = SLEditCtrlProc;
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     WndClass.spClassName = CTRL_EDIT;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/src/control/listbox.c b/src/control/listbox.c
index 10a74a00..50176184 100644
--- a/src/control/listbox.c
+++ b/src/control/listbox.c
@@ -97,7 +97,7 @@ BOOL RegisterListboxControl (void)
         GetWindowElementPixelEx (HWND_NULL, HDC_SCREEN, WE_BGC_WINDOW);
 #endif
     WndClass.WinProc     = ListboxCtrlProc;
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /*
diff --git a/src/control/menubutton.c b/src/control/menubutton.c
index bbe26590..164d7982 100644
--- a/src/control/menubutton.c
+++ b/src/control/menubutton.c
@@ -96,7 +96,7 @@ BOOL RegisterMenuButtonControl (void)
 #endif
     WndClass.WinProc     = MenuButtonCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 static BOOL mbInitMenuButtonData (MENUBTNDATA* mb_data, int len)
diff --git a/src/control/newtoolbar.c b/src/control/newtoolbar.c
index 8417105e..a8e7015b 100644
--- a/src/control/newtoolbar.c
+++ b/src/control/newtoolbar.c
@@ -95,7 +95,7 @@ BOOL RegisterNewToolbarControl (void)
 #endif
     WndClass.WinProc     = NewToolbarCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 
diff --git a/src/control/progressbar.c b/src/control/progressbar.c
index 3a67bcdd..5caef730 100644
--- a/src/control/progressbar.c
+++ b/src/control/progressbar.c
@@ -232,7 +232,7 @@ BOOL RegisterProgressBarControl (void)
 #endif
     WndClass.WinProc     = ProgressBarCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 #endif /* _MGCTRL_PROGRESSBAR */
 
diff --git a/src/control/propsheet.c b/src/control/propsheet.c
index c86f4ee6..6dd708ca 100644
--- a/src/control/propsheet.c
+++ b/src/control/propsheet.c
@@ -101,7 +101,7 @@ BOOL RegisterPropSheetControl (void)
 #endif
     WndClass.WinProc     = PropSheetCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /**************************internal functions******************************/
diff --git a/src/control/propsheet.c_orig b/src/control/propsheet.c_orig
index 93f07dfe..39111ad6 100644
--- a/src/control/propsheet.c_orig
+++ b/src/control/propsheet.c_orig
@@ -160,7 +160,7 @@ BOOL RegisterPropSheetControl (void)
     WndClass.iBkColor    = PIXEL_lightgray;
     WndClass.WinProc     = PropSheetCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 static int DefPSProc(HWND hwnd, int message, WPARAM wParam, LPARAM lParam);
diff --git a/src/control/scrollbar.c b/src/control/scrollbar.c
index d4677e02..a674af33 100644
--- a/src/control/scrollbar.c
+++ b/src/control/scrollbar.c
@@ -1265,7 +1265,7 @@ BOOL RegisterScrollBarControl (void)
 #endif
     WndClass.WinProc     = ScrollBarCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif/* _MGCTRL_SCROLLBAR */
diff --git a/src/control/scrollview.c b/src/control/scrollview.c
index 46e20342..3c0d3a51 100644
--- a/src/control/scrollview.c
+++ b/src/control/scrollview.c
@@ -605,7 +605,7 @@ BOOL RegisterScrollViewControl (void)
 #endif
     WndClass.WinProc     = ScrollViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_SCROLLVIEW */
diff --git a/src/control/scrollwnd.c b/src/control/scrollwnd.c
index b03a35ab..9689495c 100644
--- a/src/control/scrollwnd.c
+++ b/src/control/scrollwnd.c
@@ -292,7 +292,7 @@ BOOL RegisterScrollWndControl (void)
 #endif
     WndClass.WinProc     = ScrollWndCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /* ------------------------------------ container --------------------------- */
@@ -369,7 +369,7 @@ static BOOL RegisterContainer (void)
 #endif
     WndClass.WinProc     = DefaultContainerProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_SCROLLVIEW */
diff --git a/src/control/static.c b/src/control/static.c
index 6f6c28ac..ee8088a9 100644
--- a/src/control/static.c
+++ b/src/control/static.c
@@ -360,7 +360,7 @@ BOOL RegisterStaticControl (void)
 #endif
     WndClass.WinProc     = StaticControlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_STATIC */
diff --git a/src/control/textedit.c b/src/control/textedit.c
index dc547328..e4bd0d4b 100644
--- a/src/control/textedit.c
+++ b/src/control/textedit.c
@@ -3610,17 +3610,17 @@ BOOL RegisterTextEditControl (void)
 #endif
     WndClass.WinProc     = TextEditCtrlProc;
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     WndClass.spClassName = CTRL_MLEDIT;
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     WndClass.spClassName = CTRL_MEDIT;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_TEXTEDIT */
diff --git a/src/control/trackbar.c b/src/control/trackbar.c
index e441f2a5..4e9ddc96 100644
--- a/src/control/trackbar.c
+++ b/src/control/trackbar.c
@@ -551,7 +551,7 @@ BOOL RegisterTrackBarControl (void)
             HDC_SCREEN, WE_MAINC_THREED_BODY);
 #endif
     WndClass.WinProc     = TrackBarCtrlProc;
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 #endif /* _MGCTRL_TRACKBAR */
 
diff --git a/src/ex_ctrl/animation.c b/src/ex_ctrl/animation.c
index 889986bd..69a77791 100644
--- a/src/ex_ctrl/animation.c
+++ b/src/ex_ctrl/animation.c
@@ -84,7 +84,7 @@ BOOL RegisterAnimationControl (void)
 #endif
     WndClass.WinProc     = AnimationCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #define ANIM_STATUS_STOP        0
diff --git a/src/ex_ctrl/coolbar.c b/src/ex_ctrl/coolbar.c
index 1aa0872f..36659c14 100644
--- a/src/ex_ctrl/coolbar.c
+++ b/src/ex_ctrl/coolbar.c
@@ -90,7 +90,7 @@ BOOL RegisterCoolBarControl (void)
 #endif
     WndClass.WinProc     = CoolBarCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 static COOLBARITEMDATA* GetCurTag (int posx, int posy, PCOOLBARCTRL pdata)
diff --git a/src/ex_ctrl/gridview.c b/src/ex_ctrl/gridview.c
index 263a7d43..00fea001 100644
--- a/src/ex_ctrl/gridview.c
+++ b/src/ex_ctrl/gridview.c
@@ -2544,7 +2544,7 @@ BOOL RegisterGridViewControl (void)
 #endif
     WndClass.WinProc     = GridViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_GRIDVIEW */
diff --git a/src/ex_ctrl/iconview.c b/src/ex_ctrl/iconview.c
index f80ec9d0..83ff578d 100644
--- a/src/ex_ctrl/iconview.c
+++ b/src/ex_ctrl/iconview.c
@@ -736,7 +736,7 @@ BOOL RegisterIconViewControl (void)
 #endif
     WndClass.WinProc     = IconViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 ///////////////////////////
diff --git a/src/ex_ctrl/listview.c b/src/ex_ctrl/listview.c
index 24caa501..44db3329 100644
--- a/src/ex_ctrl/listview.c
+++ b/src/ex_ctrl/listview.c
@@ -2207,7 +2207,7 @@ BOOL RegisterListViewControl (void)
 #endif
     WndClass.WinProc     = ListViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_LISTVIEW */
diff --git a/src/ex_ctrl/monthcalendar.c b/src/ex_ctrl/monthcalendar.c
index 8ba71beb..7faec9a6 100644
--- a/src/ex_ctrl/monthcalendar.c
+++ b/src/ex_ctrl/monthcalendar.c
@@ -130,7 +130,7 @@ BOOL RegisterMonthCalendarControl (void)
 #endif
     WndClass.WinProc     = MonthCalendarCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 // draw page arrow
diff --git a/src/ex_ctrl/spinbox.c b/src/ex_ctrl/spinbox.c
index 24529963..3878589a 100644
--- a/src/ex_ctrl/spinbox.c
+++ b/src/ex_ctrl/spinbox.c
@@ -419,7 +419,7 @@ BOOL RegisterSpinControl (void)
 #endif
     WndClass.WinProc     = SpinCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 #endif /* _MGCTRL_SPINBOX */
diff --git a/src/ex_ctrl/treeview.c b/src/ex_ctrl/treeview.c
index 03c2eddb..c4916234 100644
--- a/src/ex_ctrl/treeview.c
+++ b/src/ex_ctrl/treeview.c
@@ -120,7 +120,7 @@ BOOL RegisterTreeViewControl (void)
 #endif
     WndClass.WinProc     = TreeViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 void TreeViewControlCleanup (void)
diff --git a/src/ex_ctrl/treeview_rdr.c b/src/ex_ctrl/treeview_rdr.c
index 557f6291..08629f60 100644
--- a/src/ex_ctrl/treeview_rdr.c
+++ b/src/ex_ctrl/treeview_rdr.c
@@ -92,7 +92,7 @@ BOOL RegisterTreeViewRdrControl (void)
 #endif
     WndClass.WinProc     = TreeViewCtrlProc;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 
 /*
diff --git a/src/gui/ctrlclass.c b/src/gui/ctrlclass.c
index 30384d51..62965463 100644
--- a/src/gui/ctrlclass.c
+++ b/src/gui/ctrlclass.c
@@ -307,7 +307,7 @@ void mg_TerminateControlClass ()
 PCTRLCLASSINFO gui_GetControlClassInfo (const char* szClassName)
 {
     PCTRLCLASSINFO cci;
-    int i=0;
+    int i = 0;
     char szName [MAXLEN_CLASSNAME + 1];
 
     if (szClassName == NULL) return NULL;
@@ -385,7 +385,7 @@ int gui_ControlClassDataOp (int Operation, PWNDCLASS pWndClass)
     return ERR_OK;
 }
 
-int GetCtrlClassAddData (const char* szClassName, DWORD* pAddData)
+int gui_GetCtrlClassAddData (const char* szClassName, DWORD* pAddData)
 {
     PCTRLCLASSINFO cci;
 
@@ -399,7 +399,7 @@ int GetCtrlClassAddData (const char* szClassName, DWORD* pAddData)
     return ERR_CTRLCLASS_INVNAME;
 }
 
-int SetCtrlClassAddData (const char* szClassName, DWORD dwAddData)
+int gui_SetCtrlClassAddData (const char* szClassName, DWORD dwAddData)
 {
     PCTRLCLASSINFO cci;
 
@@ -413,7 +413,7 @@ int SetCtrlClassAddData (const char* szClassName, DWORD dwAddData)
     return ERR_CTRLCLASS_INVNAME;
 }
 
-int AddNewControlClass (PWNDCLASS pWndClass)
+int gui_AddNewControlClass (PWNDCLASS pWndClass)
 {
     PCTRLCLASSINFO cci, newcci;
     char szClassName [MAXLEN_CLASSNAME + 2];
@@ -541,7 +541,7 @@ void gui_EmptyControlClassInfoTable ()
     }
 }
 
-BOOL SetWindowExStyle (HWND hWnd, DWORD dwExStyle)
+BOOL gui_SetWindowExStyle (HWND hWnd, DWORD dwExStyle)
 {
     PMAINWIN pWin;
     PCONTROL pCtrl;
diff --git a/src/include/ctrlclass.h b/src/include/ctrlclass.h
index c03cbcfc..43a77556 100644
--- a/src/include/ctrlclass.h
+++ b/src/include/ctrlclass.h
@@ -223,8 +223,8 @@ PCONTROL gui_Control (HWND hWnd);   // check whether hWnd is control
                                 // and return pointer to control hWnd.
 
 /* Undisclosed APIs */
-MG_EXPORT int AddNewControlClass (PWNDCLASS pWndClass);
-MG_EXPORT BOOL SetWindowExStyle (HWND hWnd, DWORD dwExStyle);
+MG_EXPORT int gui_AddNewControlClass (PWNDCLASS pWndClass);
+MG_EXPORT BOOL gui_SetWindowExStyle (HWND hWnd, DWORD dwExStyle);
 
 #ifdef _DEBUG_CTRL
 void dbg_DumpCtrlClassInfoTable (void);
diff --git a/src/kernel/desktop-comm.c b/src/kernel/desktop-comm.c
index 6531bd05..62f0e09a 100644
--- a/src/kernel/desktop-comm.c
+++ b/src/kernel/desktop-comm.c
@@ -2415,7 +2415,7 @@ static LRESULT DesktopWinProc (HWND hWnd, UINT message,
         return dskBroadcastMessage ((PMSG)lParam);
 
     case MSG_REGISTERWNDCLASS:
-        return AddNewControlClass ((PWNDCLASS)lParam);
+        return gui_AddNewControlClass ((PWNDCLASS)lParam);
 
     case MSG_UNREGISTERWNDCLASS:
         return gui_DeleteControlClass ((const char*)lParam);
diff --git a/src/kernel/desktop-procs.c b/src/kernel/desktop-procs.c
index 6b6d6ccc..e786f15e 100644
--- a/src/kernel/desktop-procs.c
+++ b/src/kernel/desktop-procs.c
@@ -4629,7 +4629,7 @@ static LRESULT DesktopWinProc (HWND hWnd, UINT message,
     }
 
     case MSG_REGISTERWNDCLASS:
-        return AddNewControlClass ((PWNDCLASS)lParam);
+        return gui_AddNewControlClass ((PWNDCLASS)lParam);
 
     case MSG_UNREGISTERWNDCLASS:
         return gui_DeleteControlClass ((const char*)lParam);
diff --git a/src/textedit/mtextedit.c b/src/textedit/mtextedit.c
index 6b925888..6aeb6d55 100644
--- a/src/textedit/mtextedit.c
+++ b/src/textedit/mtextedit.c
@@ -6783,7 +6783,7 @@ static LRESULT mTextEditCtrlProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM
         return DefaultControlProc (hWnd, message, wParam, lParam);
 }
 
-extern int AddNewControlClass (PWNDCLASS pWndClass);
+extern int gui_AddNewControlClass (PWNDCLASS pWndClass);
 BOOL RegisterTextEditControl (void)
 {
     WNDCLASS WndClass;
@@ -6803,17 +6803,17 @@ BOOL RegisterTextEditControl (void)
 
     init_textedit();
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     WndClass.spClassName = CTRL_MLEDIT;
 
-    if (AddNewControlClass (&WndClass) != ERR_OK)
+    if (gui_AddNewControlClass (&WndClass) != ERR_OK)
         return FALSE;
 
     WndClass.spClassName = CTRL_MEDIT;
 
-    return AddNewControlClass (&WndClass) == ERR_OK;
+    return gui_AddNewControlClass (&WndClass) == ERR_OK;
 }
 #endif /* __MINIGUI_LIB__ */
 #endif /* defined(_MGCTRL_TEXTEDIT_USE_NEW_IMPL) || defined(_MGNCS_TEXTEDITOR) */