diff --git a/core/surface.cpp b/core/surface.cpp
index d410e9a..a130ffa 100644
--- a/core/surface.cpp
+++ b/core/surface.cpp
@@ -406,7 +406,7 @@ int c_surface::set_frame_layer_visible_rect(c_rect& rect, unsigned int z_order)
 	return 0;
 }
 
-int c_surface::flush_scrren(int left, int top, int right, int bottom)
+int c_surface::flush_screen(int left, int top, int right, int bottom)
 {
 	if(left < 0 || left >= m_width || right < 0 || right >= m_width ||
 		top < 0 || top >= m_height || bottom < 0 || bottom >= m_height)
diff --git a/core_include/api.h b/core_include/api.h
index 1a52c26..c68f3f4 100644
--- a/core_include/api.h
+++ b/core_include/api.h
@@ -1,5 +1,5 @@
-#ifndef API_H
-#define API_H
+#ifndef GUILITE_CORE_INCLUDE_API_H
+#define GUILITE_CORE_INCLUDE_API_H
 
 #define REAL_TIME_TASK_CYCLE_MS		50
 
@@ -13,14 +13,14 @@
 #define GL_RGB_32_to_16(rgb) (((((unsigned int)(rgb)) & 0xFF) >> 3) | ((((unsigned int)(rgb)) & 0xFC00) >> 5) | ((((unsigned int)(rgb)) & 0xF80000) >> 8))
 #define GL_RGB_16_to_32(rgb) ((0xFF << 24) | ((((unsigned int)(rgb)) & 0x1F) << 3) | ((((unsigned int)(rgb)) & 0x7E0) << 5) | ((((unsigned int)(rgb)) & 0xF800) << 8))
 
-#define ALIGN_HCENTER		0x00000000L
-#define ALIGN_LEFT			0x01000000L
-#define ALIGN_RIGHT			0x02000000L
-#define ALIGN_HMASK			0x03000000L
-
-#define ALIGN_VCENTER		0x00000000L
-#define ALIGN_TOP			0x00100000L
-#define ALIGN_BOTTOM		0x00200000L
+#define ALIGN_HCENTER		0x00000000L
+#define ALIGN_LEFT			0x01000000L
+#define ALIGN_RIGHT			0x02000000L
+#define ALIGN_HMASK			0x03000000L
+
+#define ALIGN_VCENTER		0x00000000L
+#define ALIGN_TOP				0x00100000L
+#define ALIGN_BOTTOM		0x00200000L
 #define ALIGN_VMASK			0x00300000L
 
 typedef struct
diff --git a/core_include/audio.h b/core_include/audio.h
index 18d7cff..a519eac 100644
--- a/core_include/audio.h
+++ b/core_include/audio.h
@@ -1,5 +1,5 @@
-#ifndef AUDIO_MANGE_H
-#define AUDIO_MANGE_H
+#ifndef GUILITE_CORE_INCLUDE_AUDIO_H
+#define GUILITE_CORE_INCLUDE_AUDIO_H
 
 enum AUDIO_TYPE
 {
diff --git a/core_include/bitmap.h b/core_include/bitmap.h
index c1a5b0e..bc8a315 100644
--- a/core_include/bitmap.h
+++ b/core_include/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef BITMAP_UNIT_H
-#define BITMAP_UNIT_H
+#ifndef GUILITE_CORE_INCLUDE_BITMAP_H
+#define GUILITE_CORE_INCLUDE_BITMAP_H
 
 #define	DEFAULT_MASK_COLOR 0xFF080408
 class c_surface;
diff --git a/core_include/cmd_target.h b/core_include/cmd_target.h
index f867a6a..60835ec 100644
--- a/core_include/cmd_target.h
+++ b/core_include/cmd_target.h
@@ -1,5 +1,5 @@
-#ifndef CMD_TARGET_H
-#define CMD_TARGET_H
+#ifndef GUILITE_CORE_INCLUDE_CMD_TARGET_H
+#define GUILITE_CORE_INCLUDE_CMD_TARGET_H
 
 class c_cmd_target;
 
diff --git a/core_include/display.h b/core_include/display.h
index e64813e..cdbfe4b 100644
--- a/core_include/display.h
+++ b/core_include/display.h
@@ -1,5 +1,5 @@
-#ifndef DISPLAY_H
-#define DISPLAY_H
+#ifndef GUILITE_CORE_INCLUDE_DISPLAY_H
+#define GUILITE_CORE_INCLUDE_DISPLAY_H
 
 #define SURFACE_CNT_MAX	6//root + pages
 
diff --git a/core_include/msg.h b/core_include/msg.h
index 9614cf9..1230637 100644
--- a/core_include/msg.h
+++ b/core_include/msg.h
@@ -1,5 +1,5 @@
-#ifndef MSG_H
-#define MSG_H
+#ifndef GUILITE_CORE_INCLUDE_MSG_H
+#define GUILITE_CORE_INCLUDE_MSG_H
 
 typedef struct
 {
diff --git a/core_include/rect.h b/core_include/rect.h
index 5651bb5..d5466e0 100644
--- a/core_include/rect.h
+++ b/core_include/rect.h
@@ -1,5 +1,5 @@
-#ifndef RECT_H
-#define RECT_H
+#ifndef GUILITE_CORE_INCLUDE_RECT_H
+#define GUILITE_CORE_INCLUDE_RECT_H
 
 class c_rect
 {
diff --git a/core_include/resource.h b/core_include/resource.h
index 5ba50b1..c5cdc72 100644
--- a/core_include/resource.h
+++ b/core_include/resource.h
@@ -1,5 +1,5 @@
-#ifndef  RESOURCE_H
-#define  RESOURCE_H
+#ifndef  GUILITE_CORE_INCLUDE_RESOURCE_H
+#define  GUILITE_CORE_INCLUDE_RESOURCE_H
 
 //BITMAP
 typedef struct struct_bitmap_info
diff --git a/core_include/surface.h b/core_include/surface.h
index 6f1820b..906ee16 100644
--- a/core_include/surface.h
+++ b/core_include/surface.h
@@ -1,5 +1,5 @@
-#ifndef SURFACE_H
-#define SURFACE_H
+#ifndef GUILITE_CORE_INCLUDE_SURFACE_H
+#define GUILITE_CORE_INCLUDE_SURFACE_H
 
 class c_frame_layer
 {
@@ -47,7 +47,7 @@ public:
 		fill_rect(rect.m_left, rect.m_top, rect.m_right, rect.m_bottom, rgb, z_order);
 	}
 
-	int flush_scrren(int left, int top, int right, int bottom);
+	int flush_screen(int left, int top, int right, int bottom);
 	bool is_valid(c_rect rect);
 	bool is_active() { return m_is_active; }
 	c_display* get_display() { return m_display; }
diff --git a/core_include/theme.h b/core_include/theme.h
index 7f5f68a..e72e674 100644
--- a/core_include/theme.h
+++ b/core_include/theme.h
@@ -1,5 +1,5 @@
-#ifndef MY_RESOURCE_H
-#define MY_RESOURCE_H
+#ifndef GUILITE_CORE_INCLUDE_THEME_H
+#define GUILITE_CORE_INCLUDE_THEME_H
 
 typedef struct struct_font_info		FONT_INFO;
 typedef struct struct_color_rect	COLOR_RECT;
diff --git a/core_include/wnd.h b/core_include/wnd.h
index 5ff114e..dbbf3ab 100644
--- a/core_include/wnd.h
+++ b/core_include/wnd.h
@@ -1,5 +1,5 @@
-#ifndef WND_H
-#define WND_H
+#ifndef GUILITE_CORE_INCLUDE_WND_H
+#define GUILITE_CORE_INCLUDE_WND_H
 
 typedef struct struct_font_info		FONT_INFO;
 typedef struct struct_color_rect	COLOR_RECT;
diff --git a/core_include/word.h b/core_include/word.h
index 26eca7f..f7039a2 100644
--- a/core_include/word.h
+++ b/core_include/word.h
@@ -1,5 +1,5 @@
-#ifndef WORD_UNIT_H
-#define WORD_UNIT_H
+#ifndef GUILITE_CORE_INCLUDE_WORD_H
+#define GUILITE_CORE_INCLUDE_WORD_H
 
 class c_surface;
 class c_word
diff --git a/widgets/slide_group.cpp b/widgets/slide_group.cpp
index 9f0da4e..abb1a19 100644
--- a/widgets/slide_group.cpp
+++ b/widgets/slide_group.cpp
@@ -43,7 +43,7 @@ int c_slide_group::set_active_slide(int index, bool is_redraw)
 			{
 				c_rect rc;
 				get_screen_rect(rc);
-				m_slides[i]->get_surface()->flush_scrren(rc.m_left, rc.m_top, rc.m_right, rc.m_bottom);
+				m_slides[i]->get_surface()->flush_screen(rc.m_left, rc.m_top, rc.m_right, rc.m_bottom);
 			}
 		}
 		else
diff --git a/widgets_include/button.h b/widgets_include/button.h
index 3965686..dde9b84 100644
--- a/widgets_include/button.h
+++ b/widgets_include/button.h
@@ -1,5 +1,5 @@
-#ifndef BUTTON_H
-#define BUTTON_H
+#ifndef GUILITE_WIDGETS_INCLUDE_BUTTON_H
+#define GUILITE_WIDGETS_INCLUDE_BUTTON_H
 
 #define GL_BN_CLICKED							0x1111
 #define ON_GL_BN_CLICKED(ctrlId, func)                                       \
diff --git a/widgets_include/dialog.h b/widgets_include/dialog.h
index 84b56e5..01ea2ee 100644
--- a/widgets_include/dialog.h
+++ b/widgets_include/dialog.h
@@ -1,5 +1,5 @@
-#ifndef DIALOG_H
-#define DIALOG_H
+#ifndef GUILITE_WIDGETS_INCLUDE_DIALOG_H
+#define GUILITE_WIDGETS_INCLUDE_DIALOG_H
 
 class c_surface;
 class c_dialog;
diff --git a/widgets_include/edit.h b/widgets_include/edit.h
index 9e8a847..f6a8000 100644
--- a/widgets_include/edit.h
+++ b/widgets_include/edit.h
@@ -1,5 +1,5 @@
-#ifndef EDIT_H
-#define EDIT_H
+#ifndef GUILITE_WIDGETS_INCLUDE_EDIT_H
+#define GUILITE_WIDGETS_INCLUDE_EDIT_H
 
 #define MAX_EDIT_STRLEN		32
 
diff --git a/widgets_include/gesture.h b/widgets_include/gesture.h
index 0c92695..f563f62 100644
--- a/widgets_include/gesture.h
+++ b/widgets_include/gesture.h
@@ -1,5 +1,5 @@
-#ifndef GESTURE_H
-#define GESTURE_H
+#ifndef GUILITE_WIDGETS_INCLUDE_GESTURE_H
+#define GUILITE_WIDGETS_INCLUDE_GESTURE_H
 
 typedef enum{
 	TOUCH_MOVE,
diff --git a/widgets_include/keyboard.h b/widgets_include/keyboard.h
index 86991d1..d52ddc7 100644
--- a/widgets_include/keyboard.h
+++ b/widgets_include/keyboard.h
@@ -1,5 +1,5 @@
-#ifndef KEYBOARD_H
-#define KEYBOARD_H
+#ifndef GUILITE_WIDGETS_INCLUDE_KEYBOARD_H
+#define GUILITE_WIDGETS_INCLUDE_KEYBOARD_H
 
 #define KEYBORAD_CLICK			0x5014
 #define ON_KEYBORAD_UPDATE(ctrlId, func)  \
diff --git a/widgets_include/label.h b/widgets_include/label.h
index 9fbbbaf..71c48c1 100644
--- a/widgets_include/label.h
+++ b/widgets_include/label.h
@@ -1,5 +1,5 @@
-#ifndef LABEL_H
-#define LABEL_H
+#ifndef GUILITE_WIDGETS_INCLUDE_LABEL_H
+#define GUILITE_WIDGETS_INCLUDE_LABEL_H
 
 class c_label : public c_wnd
 {
diff --git a/widgets_include/list_box.h b/widgets_include/list_box.h
index bb24094..0d0764b 100644
--- a/widgets_include/list_box.h
+++ b/widgets_include/list_box.h
@@ -1,5 +1,5 @@
-#ifndef LIST_BOX_H
-#define LIST_BOX_H
+#ifndef GUILITE_WIDGETS_INCLUDE_LIST_BOX_H
+#define GUILITE_WIDGETS_INCLUDE_LIST_BOX_H
 
 #define MAX_ITEM_NUM			4
 #define GL_LIST_CONFIRM			0x1
diff --git a/widgets_include/slide_group.h b/widgets_include/slide_group.h
index b37b6fa..dad1fea 100644
--- a/widgets_include/slide_group.h
+++ b/widgets_include/slide_group.h
@@ -1,5 +1,5 @@
-#ifndef PAGE_GROUP_H
-#define PAGE_GROUP_H
+#ifndef GUILITE_WIDGETS_INCLUDE_SLIDE_GROUP_H
+#define GUILITE_WIDGETS_INCLUDE_SLIDE_GROUP_H
 
 #define MAX_PAGES	5
 
diff --git a/widgets_include/spinbox.h b/widgets_include/spinbox.h
index 85c5158..2a8b5d5 100644
--- a/widgets_include/spinbox.h
+++ b/widgets_include/spinbox.h
@@ -1,5 +1,5 @@
-#ifndef SPIN_BOX_H
-#define SPIN_BOX_H
+#ifndef GUILITE_WIDGETS_INCLUDE_SPINBOX_H
+#define GUILITE_WIDGETS_INCLUDE_SPINBOX_H
 
 #define GL_SPIN_CONFIRM				0x2222
 #define	GL_SPIN_CHANGE				0x3333
diff --git a/widgets_include/table.h b/widgets_include/table.h
index e9024d4..2613178 100644
--- a/widgets_include/table.h
+++ b/widgets_include/table.h
@@ -1,5 +1,5 @@
-#ifndef TABLE_H
-#define TABLE_H
+#ifndef GUILITE_WIDGETS_INCLUDE_TABLE_H
+#define GUILITE_WIDGETS_INCLUDE_TABLE_H
 
 #define  MAX_COL_NUM  30
 #define  MAX_ROW_NUM  30
diff --git a/widgets_include/wave_buffer.h b/widgets_include/wave_buffer.h
index 35df65b..70b83c5 100644
--- a/widgets_include/wave_buffer.h
+++ b/widgets_include/wave_buffer.h
@@ -1,5 +1,5 @@
-#ifndef WAVE_BUFFER_H
-#define WAVE_BUFFER_H
+#ifndef GUILITE_WIDGETS_INCLUDE_WAVE_BUFFER_H
+#define GUILITE_WIDGETS_INCLUDE_WAVE_BUFFER_H
 
 #define WAVE_BUFFER_LEN	1024
 #define WAVE_READ_CACHE_LEN	8
diff --git a/widgets_include/wave_ctrl.h b/widgets_include/wave_ctrl.h
index 9b042ac..2d4c1a7 100644
--- a/widgets_include/wave_ctrl.h
+++ b/widgets_include/wave_ctrl.h
@@ -1,5 +1,5 @@
-#ifndef WAVE_CTRL_H
-#define WAVE_CTRL_H
+#ifndef GUILITE_WIDGETS_INCLUDE_WAVE_CTRL_H
+#define GUILITE_WIDGETS_INCLUDE_WAVE_CTRL_H
 
 typedef enum
 {