diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..eacf8f6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,38 @@
+src_dir=`pwd`
+
+.PHONY: all clean
+
+all: pncc_rel
+
+clean: plat_clean mss_clean
+
+norfolk_rel: plat_all norfolk
+
+cook_rel: plat_all cook
+
+zed_rel: plat_all zed
+
+pncc_rel: plat_all pncc
+
+plat_clean:
+	$(MAKE) -C plat clean
+
+mss_clean:
+	$(MAKE) -C mss clean
+
+pncc:
+	$(MAKE) -C mss pncc
+
+norfolk:
+	$(MAKE) -C mss norfolk
+
+cook:
+	$(MAKE) -C mss cook
+
+zed:
+	$(MAKE) -C mss zed
+
+plat_all:
+	@echo "====================== make $@ ======================="
+	@cd $(src_dir)/plat && $(MAKE) all
+	@cd -
\ No newline at end of file
diff --git a/include/Makefile.backup b/inc/Makefile.backup
similarity index 100%
rename from include/Makefile.backup
rename to inc/Makefile.backup
diff --git a/include/Makefile.cov b/inc/Makefile.cov
similarity index 100%
rename from include/Makefile.cov
rename to inc/Makefile.cov
diff --git a/include/Makefile.doxygen b/inc/Makefile.doxygen
similarity index 100%
rename from include/Makefile.doxygen
rename to inc/Makefile.doxygen
diff --git a/include/Makefile.indent b/inc/Makefile.indent
similarity index 100%
rename from include/Makefile.indent
rename to inc/Makefile.indent
diff --git a/include/Makefile.rules b/inc/Makefile.rules
similarity index 100%
rename from include/Makefile.rules
rename to inc/Makefile.rules
diff --git a/include/Makefile.splint b/inc/Makefile.splint
similarity index 100%
rename from include/Makefile.splint
rename to inc/Makefile.splint
diff --git a/include/Makefile.usage b/inc/Makefile.usage
similarity index 100%
rename from include/Makefile.usage
rename to inc/Makefile.usage
diff --git a/mss/main/Makefile b/mss/main/Makefile
index d7405dc..7b04e4d 100644
--- a/mss/main/Makefile
+++ b/mss/main/Makefile
@@ -93,5 +93,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/mss/main/src/wxc2main.c b/mss/main/src/wxc2main.c
index adfc648..1635a2f 100644
--- a/mss/main/src/wxc2main.c
+++ b/mss/main/src/wxc2main.c
@@ -1779,10 +1779,16 @@ int wxc2_read_sysparam(void)
 					return 0;
 				}
 				temp_ptr = strchr(hostname,'-');
-				if (memcmp(ch_ptr,hostname,strlen(hostname)-strlen(temp_ptr)) != 0)
-				{
-					printf("The host name is unexpect!\n");
-					return 0;
+				if (temp_ptr != NULL) {
+					if (strncmp(ch_ptr, hostname, strlen(hostname) - strlen(temp_ptr)) != 0) {
+						printf("The host name is unexpected!\n");
+						return 0;
+					}
+				} else {
+					if (strncmp(ch_ptr, hostname, strlen(hostname)) != 0) {
+						printf("The host name is unexpected!\n");
+						return 0;
+					}
 				}
 				strcpy(temp_info,ch_ptr);
 			}
diff --git a/plat/debug/Makefile b/plat/debug/Makefile
index af5e4fd..2b140fe 100644
--- a/plat/debug/Makefile
+++ b/plat/debug/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/iptrans/Makefile b/plat/iptrans/Makefile
index e010076..2745547 100644
--- a/plat/iptrans/Makefile
+++ b/plat/iptrans/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/m2ua/Makefile b/plat/m2ua/Makefile
index 60d5991..b12dd59 100644
--- a/plat/m2ua/Makefile
+++ b/plat/m2ua/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/mtp3/Makefile b/plat/mtp3/Makefile
index 1a6819d..3d6cf9b 100644
--- a/plat/mtp3/Makefile
+++ b/plat/mtp3/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/public/Makefile b/plat/public/Makefile
index fbf49ad..6f4eb06 100644
--- a/plat/public/Makefile
+++ b/plat/public/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/public/ut/main/Makefile b/plat/public/ut/main/Makefile
index 36f9497..a9e0faa 100644
--- a/plat/public/ut/main/Makefile
+++ b/plat/public/ut/main/Makefile
@@ -92,7 +92,7 @@ COVER_REPORT_PATH     = ./ut/ut_doc/output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
 
 
diff --git a/plat/public/ut/timer/Makefile b/plat/public/ut/timer/Makefile
index 4443bd2..c62d0e4 100644
--- a/plat/public/ut/timer/Makefile
+++ b/plat/public/ut/timer/Makefile
@@ -69,5 +69,5 @@ COVER_REPORT_PATH     = ./ut/ut_doc/output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/radius/Makefile b/plat/radius/Makefile
index df049c7..1765d5b 100644
--- a/plat/radius/Makefile
+++ b/plat/radius/Makefile
@@ -92,5 +92,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/radius/ut/Makefile b/plat/radius/ut/Makefile
index 782369d..40a8193 100644
--- a/plat/radius/ut/Makefile
+++ b/plat/radius/ut/Makefile
@@ -98,5 +98,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/sccp/Makefile b/plat/sccp/Makefile
index cc9852c..15ef8cc 100644
--- a/plat/sccp/Makefile
+++ b/plat/sccp/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/sccp/ut/fsmtest/Makefile b/plat/sccp/ut/fsmtest/Makefile
index dbf4294..5166e27 100644
--- a/plat/sccp/ut/fsmtest/Makefile
+++ b/plat/sccp/ut/fsmtest/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./ut/ut_doc/output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/scf/Makefile b/plat/scf/Makefile
index 85882bd..70159d6 100644
--- a/plat/scf/Makefile
+++ b/plat/scf/Makefile
@@ -89,5 +89,5 @@ COVER_REPORT_PATH     = /ut/ut_doc/output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/smpp/Makefile b/plat/smpp/Makefile
index c5bb9a4..ae42ef4 100644
--- a/plat/smpp/Makefile
+++ b/plat/smpp/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/snmp/Makefile b/plat/snmp/Makefile
index b919410..ada224e 100644
--- a/plat/snmp/Makefile
+++ b/plat/snmp/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/tcap/Makefile b/plat/tcap/Makefile
index 10a49b1..903c37f 100644
--- a/plat/tcap/Makefile
+++ b/plat/tcap/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/tcp/Makefile b/plat/tcp/Makefile
index 81f13fe..8cd89ad 100644
--- a/plat/tcp/Makefile
+++ b/plat/tcp/Makefile
@@ -95,5 +95,5 @@ COVER_REPORT_PATH     = ./output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules
diff --git a/plat/xapp/Makefile b/plat/xapp/Makefile
index 045a9ba..56b06ad 100644
--- a/plat/xapp/Makefile
+++ b/plat/xapp/Makefile
@@ -92,5 +92,5 @@ COVER_REPORT_PATH     = ./ut/ut_doc/output
 ##  include makefile.rules (Do not change)
 ##
 ##--------------------------------------
-MAKE_INCLUDE = ../../include
+MAKE_INCLUDE = ../../inc
 include $(MAKE_INCLUDE)/Makefile.rules