diff --git a/DESCRIPTION b/DESCRIPTION
index 5867323..7472ed3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: gdsfmt
 Type: Package
 Title: R Interface to CoreArray Genomic Data Structure (GDS) Files
-Version: 1.38.1
-Date: 2024-01-19
+Version: 1.39.2
+Date: 2024-03-29
 Depends: R (>= 2.15.0), methods
 Suggests: parallel, digest, Matrix, crayon, RUnit, knitr, markdown, rmarkdown,
         BiocGenerics
diff --git a/inst/include/R_GDS2.h b/inst/include/R_GDS2.h
index 3fb8ead..b6926dc 100755
--- a/inst/include/R_GDS2.h
+++ b/inst/include/R_GDS2.h
@@ -29,7 +29,7 @@
  *	\file     R_GDS2.h
  *	\author   Xiuwen Zheng [zhengxwen@gmail.com]
  *	\version  1.0
- *	\date     2014 - 2020
+ *	\date     2014 - 2022
  *	\brief    C interface to gdsfmt dynamic library
  *	\details
 **/
diff --git a/inst/include/R_GDS_CPP.h b/inst/include/R_GDS_CPP.h
index 69775f4..33f0961 100755
--- a/inst/include/R_GDS_CPP.h
+++ b/inst/include/R_GDS_CPP.h
@@ -37,11 +37,11 @@
 #ifndef _HEADER_R_GDS_CPP_
 #define _HEADER_R_GDS_CPP_
 
-#include <R_GDS.h>
 #include <cstdlib>
 #include <cstring>
 #include <cstdarg>
 #include <climits>
+#include <R_GDS.h>
 
 
 namespace CoreArray
diff --git a/inst/include/dTrait.h b/inst/include/dTrait.h
index 54ea36a..5edf3c3 100755
--- a/inst/include/dTrait.h
+++ b/inst/include/dTrait.h
@@ -8,7 +8,7 @@
 //
 // dTrait.h: Trait classes for elementary types
 //
-// Copyright (C) 2007-2018    Xiuwen Zheng
+// Copyright (C) 2007-2024    Xiuwen Zheng
 //
 // This file is part of CoreArray.
 //
@@ -29,7 +29,7 @@
  *	\file     dTrait.h
  *	\author   Xiuwen Zheng [zhengxwen@gmail.com]
  *	\version  1.0
- *	\date     2007 - 2018
+ *	\date     2007 - 2024
  *	\brief    Trait classes for elementary types
  *	\details
 **/
@@ -38,11 +38,10 @@
 #ifndef _HEADER_COREARRAY_TRAIT_
 #define _HEADER_COREARRAY_TRAIT_
 
-#include "dType.h"
-
 #include <cfloat>
 #include <limits>
 #include <string>
+#include "dType.h"
 
 
 namespace CoreArray
diff --git a/inst/include/dType.h b/inst/include/dType.h
index 5442d6a..1519450 100755
--- a/inst/include/dType.h
+++ b/inst/include/dType.h
@@ -8,7 +8,7 @@
 //
 // dType.h: Fundamental types
 //
-// Copyright (C) 2007-2018    Xiuwen Zheng
+// Copyright (C) 2007-2024    Xiuwen Zheng
 //
 // This file is part of CoreArray.
 //
@@ -29,7 +29,7 @@
  *	\file     dType.h
  *	\author   Xiuwen Zheng [zhengxwen@gmail.com]
  *	\version  1.0
- *	\date     2007 - 2018
+ *	\date     2007 - 2024
  *	\brief    Fundamental types
  *	\details
 **/
@@ -38,23 +38,22 @@
 #ifndef _HEADER_COREARRAY_TYPE_
 #define _HEADER_COREARRAY_TYPE_
 
-#include "CoreDEF.h"
-
 #ifndef __STDC_LIMIT_MACROS
 #   define __STDC_LIMIT_MACROS
 #endif
 #include <stdint.h>
 
-#ifdef COREARRAY_POSIX
-#   // need 'ssize_t'
-#   include <unistd.h>
-#endif
-
 #ifdef __cplusplus
 #   // to define UTF8String, UTF16String and UTF32String
 #   include <string>
 #endif
 
+#include "CoreDEF.h"
+#ifdef COREARRAY_POSIX
+#   // need 'ssize_t'
+#   include <unistd.h>
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {