diff --git a/src/include/libpmem.h b/src/include/libpmem.h
index 0175ad56934cebb95583150012e90e61855244c1..60902743581f923fe0ba743553b5aa7b1b2f93c3 100644
--- a/src/include/libpmem.h
+++ b/src/include/libpmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEM_H
 #define LIBPMEM_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -62,8 +64,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * This limit is set arbitrary to incorporate a pool header and required
  * alignment plus supply.
diff --git a/src/include/libpmemblk.h b/src/include/libpmemblk.h
index 6b7dd736b1793b0d4676073b19a612867e926596..232f821cc7c248aadc054eb9e6e019df4feb4e05 100644
--- a/src/include/libpmemblk.h
+++ b/src/include/libpmemblk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEMBLK_H
 #define LIBPMEMBLK_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -72,8 +74,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * opaque type, internal to libpmemblk
  */
diff --git a/src/include/libpmemlog.h b/src/include/libpmemlog.h
index e3de673fe79e80a94bc2561058487606332be97b..f608582a56c173c48ed72fa95f64a06b633ce181 100644
--- a/src/include/libpmemlog.h
+++ b/src/include/libpmemlog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #ifndef LIBPMEMLOG_H
 #define LIBPMEMLOG_H 1
 
+#include <sys/types.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -74,8 +76,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 /*
  * opaque type, internal to libpmemlog
  */
diff --git a/src/include/libpmempool.h b/src/include/libpmempool.h
index 9f14bd025994717e66f8ed5a29d31ac19a358564..144601feec28573ad63d210b1515f9dc60560c99 100644
--- a/src/include/libpmempool.h
+++ b/src/include/libpmempool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018, Intel Corporation
+ * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -39,6 +39,10 @@
 #ifndef LIBPMEMPOOL_H
 #define LIBPMEMPOOL_H 1
 
+#include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
+
 #ifdef _WIN32
 #include <pmemcompat.h>
 
@@ -78,11 +82,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stddef.h>
-#include <limits.h>
-
-
 /* PMEMPOOL CHECK */
 
 /*
diff --git a/src/include/librpmem.h b/src/include/librpmem.h
index 8c102bc92d5791abb7253c1288308829dd95863e..b9fb26143d4a9f1c5fe821cb097a64aac466c286 100644
--- a/src/include/librpmem.h
+++ b/src/include/librpmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018, Intel Corporation
+ * Copyright 2016-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,13 +42,13 @@
 #ifndef LIBRPMEM_H
 #define LIBRPMEM_H 1
 
+#include <sys/types.h>
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <sys/types.h>
-#include <stdint.h>
-
 typedef struct rpmem_pool RPMEMpool;
 
 #define RPMEM_POOL_HDR_SIG_LEN	8
diff --git a/src/include/libvmem.h b/src/include/libvmem.h
index e39cdbbb2b6b4bc9cb42fd8b9d5cf9599c5af9f7..d9d841397280ddf0ad787148c56a84aa47e615ae 100644
--- a/src/include/libvmem.h
+++ b/src/include/libvmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,9 @@
 #ifndef LIBVMEM_H
 #define LIBVMEM_H 1
 
+#include <sys/types.h>
+#include <stddef.h>
+
 #ifdef _WIN32
 #ifndef PMDK_UTF8_API
 #define vmem_create vmem_createW
@@ -57,9 +60,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-#include <stddef.h>
-
 typedef struct vmem VMEM;	/* opaque type internal to libvmem */
 
 /*
diff --git a/src/include/libvmmalloc.h b/src/include/libvmmalloc.h
index 36d776c04d3074c16c10f069346d4a43720fa4fc..4afcb6a18818228264e64f1198d587e5467a3bbe 100644
--- a/src/include/libvmmalloc.h
+++ b/src/include/libvmmalloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017, Intel Corporation
+ * Copyright 2014-2019, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +41,8 @@
 #ifndef LIBVMMALLOC_H
 #define LIBVMMALLOC_H 1
 
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -48,8 +50,6 @@ extern "C" {
 #define VMMALLOC_MAJOR_VERSION 1
 #define VMMALLOC_MINOR_VERSION 1
 
-#include <sys/types.h>
-
 #define VMMALLOC_MIN_POOL ((size_t)(1024 * 1024 * 14)) /* min pool size: 14MB */
 
 /*