diff --git a/src/pal/Makefile b/src/pal/Makefile
index 79227f6d..0e3e3ea1 100644
--- a/src/pal/Makefile
+++ b/src/pal/Makefile
@@ -25,7 +25,7 @@ ifneq ($(SGX_MODE), HW)
 	CXX_OBJS := $(subst pal/src,pal/src_sim,$(CXX_OBJS))
 endif
 
-HEADER_FILES := $(sort $(wildcard include/*.h include/*/*.h))
+HEADER_FILES := $(sort $(wildcard src/*.h include/*.h include/*/*.h))
 
 C_COMMON_FLAGS := -I$(OBJ_DIR)/pal/$(SRC_OBJ) -Iinclude -Iinclude/edl
 C_FLAGS := $(C_COMMON_FLAGS) $(SGX_CFLAGS_U)
diff --git a/src/pal/include/errno2str.h b/src/pal/src/errno2str.h
similarity index 100%
rename from src/pal/include/errno2str.h
rename to src/pal/src/errno2str.h
diff --git a/src/pal/src/pal_enclave.h b/src/pal/src/pal_enclave.h
index 22deae66..98041852 100644
--- a/src/pal/src/pal_enclave.h
+++ b/src/pal/src/pal_enclave.h
@@ -3,7 +3,7 @@
 
 #include <sgx_eid.h>
 
-int pal_init_enclave(const char* instance_dir);
+int pal_init_enclave(const char *instance_dir);
 int pal_destroy_enclave(void);
 
 #define SGX_INVALID_ENCLAVE_ID          (-1)
diff --git a/src/pal/src/pal_error.h b/src/pal/src/pal_error.h
index 082c2618..24793575 100644
--- a/src/pal/src/pal_error.h
+++ b/src/pal/src/pal_error.h
@@ -4,6 +4,6 @@
 #include <errno.h>
 #include <sgx_error.h>
 
-const char* pal_get_sgx_error_msg(sgx_status_t error);
+const char *pal_get_sgx_error_msg(sgx_status_t error);
 
 #endif /* __PAL_ERROR_H__ */