include: Move the remainder of the code base to stdinc.h

Change-Id: I6a142feeaad3117bd3c75e7c5cb7231a1cfa78ae
Signed-off-by: Ben Walker <benjamin.walker@intel.com>

app/iscsi_tgt/iscsi_tgt.c

@@ -31,9 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-#include <stdlib.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

app/iscsi_top/iscsi_top.cpp

@@ -31,19 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "spdk/stdinc.h"
-#include <sys/uio.h>
 
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <termios.h>
 #include <algorithm>
 #include <map>
 #include <vector>

app/nvmf_tgt/conf.c

@@ -31,14 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctype.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ifaddrs.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

app/nvmf_tgt/nvmf_main.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
 
 #include "spdk/env.h"
 #include "nvmf_tgt.h"

app/nvmf_tgt/nvmf_rpc.c

@@ -31,8 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
 
 #include "spdk/bdev.h"
 #include "spdk/log.h"

app/nvmf_tgt/nvmf_tgt.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

app/nvmf_tgt/nvmf_tgt.h

@@ -34,7 +34,7 @@
 #ifndef NVMF_TGT_H
 #define NVMF_TGT_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/nvmf.h"
 #include "spdk/queue.h"

app/trace/trace.cpp

@@ -31,20 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "spdk/stdinc.h"
-#include <sys/uio.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <fcntl.h>
 
 #include <map>
 

app/vhost/vhost.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <getopt.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
 
 #include "spdk/log.h"
 #include "spdk/conf.h"

examples/ioat/kperf/ioat_kperf.c

@@ -31,13 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-#include <inttypes.h>
-#include <assert.h>
 
 #define ioat_max(a,b) (((a)>(b))?(a):(b))
 

examples/ioat/perf/perf.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

examples/ioat/verify/verify.c

@@ -31,11 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

examples/nvme/arbitration/arbitration.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>

examples/nvme/fio_plugin/fio_plugin.c

@@ -31,11 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <pthread.h>
 
 #include "spdk/nvme.h"
 #include "spdk/env.h"

examples/nvme/hello_world/hello_world.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "spdk/nvme.h"
 #include "spdk/env.h"

examples/nvme/hotplug/hotplug.c

@@ -31,14 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>

examples/nvme/identify/identify.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #include "spdk/log.h"
 #include "spdk/nvme.h"

examples/nvme/nvme_manage/nvme_manage.c

@@ -31,16 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctype.h>
+#include "spdk/stdinc.h"
-#include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 #include "spdk/nvme.h"
 #include "spdk/env.h"

examples/nvme/perf/perf.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>
@@ -49,8 +46,6 @@
 
 #if HAVE_LIBAIO
 #include <libaio.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #endif
 
 struct ctrlr_entry {

examples/nvme/reserve/reserve.c

@@ -31,11 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <inttypes.h>
 
 #include "spdk/nvme.h"
 #include "spdk/env.h"

include/spdk/stdinc.h

@@ -46,6 +46,7 @@ extern "C" {
 
 /* Standard C */
 #include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -56,15 +57,33 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 /* POSIX */
+#include <arpa/inet.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <ifaddrs.h>
+#include <netdb.h>
+#include <poll.h>
 #include <pthread.h>
 #include <semaphore.h>
+#include <signal.h>
+#include <syslog.h>
+#include <termios.h>
 #include <unistd.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/user.h>
+#include <sys/wait.h>
 
 #ifdef __cplusplus
 }

include/spdk_internal/assert.h

@@ -34,14 +34,14 @@
 #ifndef SPDK_INTERNAL_ASSERT_H
 #define SPDK_INTERNAL_ASSERT_H
 
+#include "spdk/stdinc.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "spdk/assert.h"
 
-#include <stdlib.h>
-
 #if !defined(DEBUG) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
 #define SPDK_UNREACHABLE() __builtin_unreachable()
 #else

include/spdk_internal/bdev.h

@@ -39,11 +39,7 @@
 #ifndef SPDK_INTERNAL_BDEV_H
 #define SPDK_INTERNAL_BDEV_H
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <unistd.h>
-#include <stddef.h>  /* for offsetof */
-#include <sys/uio.h> /* for struct iovec */
-#include <stdbool.h>
 
 #include "spdk/bdev.h"
 #include "spdk/event.h"

include/spdk_internal/copy_engine.h

@@ -34,8 +34,7 @@
 #ifndef SPDK_INTERNAL_COPY_ENGINE_H
 #define SPDK_INTERNAL_COPY_ENGINE_H
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
 
 #include "spdk/copy_engine.h"
 #include "spdk/queue.h"

include/spdk_internal/event.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_INTERNAL_EVENT_H
 #define SPDK_INTERNAL_EVENT_H
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/event.h"
 

lib/bdev/aio/blockdev_aio.c

@@ -33,13 +33,7 @@
 
 #include "blockdev_aio.h"
 
-#include <errno.h>
+#include "spdk/stdinc.h"
-#include <fcntl.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
 
 #include "spdk/bdev.h"
 #include "spdk/conf.h"

lib/bdev/aio/blockdev_aio.h

@@ -34,7 +34,8 @@
 #ifndef SPDK_BLOCKDEV_AIO_H
 #define SPDK_BLOCKDEV_AIO_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
+
 #include <libaio.h>
 
 #include "spdk/queue.h"

lib/bdev/bdev.c

@@ -32,12 +32,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/bdev.h"
+#include "spdk/stdinc.h"
 
-#include <stdlib.h>
+#include "spdk/bdev.h"
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>

lib/bdev/malloc/blockdev_malloc.c

@@ -32,8 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include "spdk/stdinc.h"
-#include <errno.h>
 
 #include "blockdev_malloc.h"
 #include "spdk/bdev.h"

lib/bdev/malloc/blockdev_malloc.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_BLOCKDEV_MALLOC_H
 #define SPDK_BLOCKDEV_MALLOC_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/bdev.h"
 

lib/bdev/nvme/blockdev_nvme.c

@@ -32,16 +32,10 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "blockdev_nvme.h"
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/param.h>
-
-#include <pthread.h>
-
 #include "spdk/conf.h"
 #include "spdk/endian.h"
 #include "spdk/bdev.h"

lib/bdev/nvme/blockdev_nvme.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_BLOCKDEV_NVME_H
 #define SPDK_BLOCKDEV_NVME_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/nvme.h"
 

lib/bdev/nvme/blockdev_nvme_rpc.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <string.h>
+#include "spdk/stdinc.h"
 
 #include "blockdev_nvme.h"
 

lib/bdev/rbd/blockdev_rbd.c

@@ -31,20 +31,13 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "blockdev_rbd.h"
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <pthread.h>
-#include <malloc.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <poll.h>
-#include <sys/eventfd.h>
 #include <rbd/librbd.h>
 #include <rados/librados.h>
+#include <sys/eventfd.h>
 
 #include "spdk/conf.h"
 #include "spdk/env.h"

lib/bdev/rbd/blockdev_rbd.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_BLOCKDEV_RBD_H
 #define SPDK_BLOCKDEV_RBD_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/bdev.h"
 

lib/bdev/split/vbdev_split.c

@@ -36,11 +36,7 @@
  * bdev and slices it into multiple smaller bdevs.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
 
 #include "spdk/rpc.h"
 #include "spdk/conf.h"

lib/blob/bdev/blob_bdev.c

@@ -30,14 +30,8 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <stdlib.h>
+
-#include <unistd.h>
+#include "spdk/stdinc.h"
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <signal.h>
 
 #include "spdk/blob_bdev.h"
 #include "spdk/blob.h"

lib/blob/blobstore.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "spdk/blob.h"
 #include "spdk/env.h"

lib/blob/request.c

@@ -31,9 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <string.h>
 
 #include "blobstore.h"
 #include "request.h"

lib/blob/request.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_BS_REQUEST_H
 #define SPDK_BS_REQUEST_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/blob.h"
 

lib/blobfs/blobfs.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 
 #include "spdk/blobfs.h"
 #include "blobfs_internal.h"

lib/blobfs/tree.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
 
 #include "spdk/blobfs.h"
 #include "blobfs_internal.h"

lib/conf/conf.c

@@ -32,14 +32,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "spdk/conf.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "spdk/string.h"
 
 struct spdk_conf_value {

lib/copy/copy_engine.c

@@ -31,11 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/copy_engine.h"
+#include "spdk/stdinc.h"
 
-#include <assert.h>
+#include "spdk_internal/copy_engine.h"
-#include <stdio.h>
-#include <errno.h>
 
 #include <rte_config.h>
 #include <rte_memcpy.h>

lib/copy/ioat/copy_engine_ioat.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <errno.h>
-#include <pthread.h>
 
 #include "spdk_internal/copy_engine.h"
 

lib/cunit/spdk_cunit.c

@@ -31,9 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_cunit.h"
+#include "spdk/stdinc.h"
 
-#include <stdio.h>
+#include "spdk_cunit.h"
 
 static int
 spdk_cunit_get_test_result(CU_pTest test)

lib/env_dpdk/env.c

@@ -31,10 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/env.h"
+#include "spdk/stdinc.h"
 
-#include <string.h>
+#include "spdk/env.h"
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_cycles.h>

lib/env_dpdk/env_internal.h

@@ -34,22 +34,12 @@
 #ifndef SPDK_ENV_INTERNAL_H
 #define SPDK_ENV_INTERNAL_H
 
+#include "spdk/stdinc.h"
+
 #define spdk_pci_device rte_pci_device
 
 #include "spdk/env.h"
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pthread.h>
-#include <stdbool.h>
-
 #include <rte_config.h>
 #include <rte_version.h>
 #include <rte_eal.h>

lib/env_dpdk/init.c

@@ -31,21 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "env_internal.h"
+#include "spdk/stdinc.h"
 
-#include <assert.h>
+#include "env_internal.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_eal.h>

lib/env_dpdk/vtophys.c

@@ -31,14 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "env_internal.h"
+#include "spdk/stdinc.h"
 
-#include <inttypes.h>
+#include "env_internal.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <pthread.h>
 
 #include <rte_config.h>
 #include <rte_eal_memconfig.h>

lib/event/app.c

@@ -31,20 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/event.h"
+#include "spdk/stdinc.h"
 
-#include <assert.h>
+#include "spdk_internal/event.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <signal.h>
 
 #include <rte_config.h>
 #include <rte_lcore.h>

lib/event/reactor.c

@@ -31,13 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/event.h"
+#include "spdk/stdinc.h"
 
-#include <assert.h>
+#include "spdk_internal/event.h"
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
 
 #ifdef __linux__
 #include <sys/prctl.h>

lib/event/rpc/app_rpc.c

@@ -31,12 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
+#include "spdk/stdinc.h"
-#include <sys/types.h>
-#include <signal.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
 
 #include "spdk/rpc.h"
 #include "spdk/util.h"

lib/event/subsystem.c

@@ -31,11 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/event.h"
+#include "spdk/stdinc.h"
 
-#include <stddef.h>
+#include "spdk_internal/event.h"
-#include <stdbool.h>
-#include <string.h>
 
 static TAILQ_HEAD(spdk_subsystem_list, spdk_subsystem) g_subsystems =
 	TAILQ_HEAD_INITIALIZER(g_subsystems);

lib/ioat/ioat.c

@@ -31,6 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "ioat_internal.h"
 
 #include "spdk/env.h"
@@ -38,8 +40,6 @@
 
 #include "spdk_internal/log.h"
 
-#include <pthread.h>
-
 struct ioat_driver {
 	pthread_mutex_t			lock;
 	TAILQ_HEAD(, spdk_ioat_chan)	attached_chans;

lib/ioat/ioat_internal.h

@@ -34,15 +34,10 @@
 #ifndef __IOAT_INTERNAL_H__
 #define __IOAT_INTERNAL_H__
 
+#include "spdk/stdinc.h"
+
 #include "spdk/ioat.h"
 #include "spdk/ioat_spec.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "spdk/queue.h"
 #include "spdk/mmio.h"
 

lib/iscsi/acceptor.c

@@ -32,11 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <errno.h>
+#include "spdk/stdinc.h"
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/types.h>
 
 #include "spdk/env.h"
 #include "spdk/event.h"

lib/iscsi/conn.c

@@ -32,24 +32,17 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <errno.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <sys/types.h>
-#include "spdk/queue.h"
-#include <sys/ioctl.h>
-#include <sys/epoll.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>
 
+#include <sys/epoll.h>
+
 #include "spdk/endian.h"
 #include "spdk/env.h"
 #include "spdk/event.h"
+#include "spdk/queue.h"
 #include "spdk/trace.h"
 #include "spdk/net.h"
 

lib/iscsi/conn.h

@@ -35,8 +35,7 @@
 #ifndef SPDK_ISCSI_CONN_H
 #define SPDK_ISCSI_CONN_H
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
 
 #include "iscsi/iscsi.h"
 #include "spdk/queue.h"

lib/iscsi/crc32c.c

@@ -32,13 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/uio.h>
 
 #include "iscsi/iscsi.h"
 #include "iscsi/crc32c.h"

lib/iscsi/crc32c.h

@@ -35,9 +35,7 @@
 #ifndef SPDK_CRC32C_H
 #define SPDK_CRC32C_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <stddef.h>
-#include <sys/uio.h>
 
 #define SPDK_CRC32C_INITIAL    0xffffffffUL
 #define	SPDK_CRC32C_XOR        0xffffffffUL

lib/iscsi/init_grp.c

@@ -32,20 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <inttypes.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <poll.h>
-#include <pthread.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/types.h>
 
 #include "spdk/conf.h"
 #include "spdk/net.h"

lib/iscsi/iscsi.c

@@ -32,23 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <inttypes.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <poll.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <fcntl.h>
-#include <time.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>
@@ -166,7 +150,6 @@ spdk_make_digest_word(uint8_t *buf, size_t len, uint32_t crc32c)
 #endif
 
 #ifndef HAVE_SRANDOMDEV
-#include <time.h>
 static void
 srandomdev(void)
 {

lib/iscsi/iscsi.h

@@ -35,11 +35,7 @@
 #ifndef SPDK_ISCSI_H
 #define SPDK_ISCSI_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <pthread.h>
-#include <sys/mman.h>
-#include <sys/uio.h>
-#include <stdbool.h>
 
 #include "spdk/bdev.h"
 #include "spdk/iscsi_spec.h"

lib/iscsi/iscsi_subsystem.c

@@ -32,9 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stddef.h>
-#include <unistd.h>
 
 #include <rte_config.h>
 #include <rte_mempool.h>

lib/iscsi/md5.c

@@ -32,10 +32,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
 
-#include <stddef.h>
 #include <openssl/md5.h>
 
 #include "iscsi/md5.h"

lib/iscsi/md5.h

@@ -35,7 +35,7 @@
 #ifndef SPDK_MD5_H
 #define SPDK_MD5_H
 
-#include <stddef.h>
+#include "spdk/stdinc.h"
 
 #include <openssl/md5.h>
 

lib/iscsi/param.c

@@ -32,13 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <inttypes.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
 
 #include "spdk/string.h"
 #include "iscsi/iscsi.h"

lib/iscsi/param.h

@@ -35,7 +35,7 @@
 #ifndef SPDK_ISCSI_PARAM_H
 #define SPDK_ISCSI_PARAM_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 enum iscsi_param_type {
 	ISPT_INVALID = -1,

lib/iscsi/portal_grp.c

@@ -32,21 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <inttypes.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <poll.h>
-#include <pthread.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <sys/types.h>
 
 #include "spdk/conf.h"
 #include "spdk/net.h"

lib/iscsi/tgt_node.c

@@ -32,27 +32,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <pthread.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
 
 #include "spdk/env.h"
 #include "spdk/event.h"

lib/iscsi/tgt_node.h

@@ -35,8 +35,7 @@
 #ifndef SPDK_ISCSI_TGT_NODE_H_
 #define SPDK_ISCSI_TGT_NODE_H_
 
-#include <pthread.h>
+#include "spdk/stdinc.h"
-#include <time.h>
 
 #include "spdk/scsi.h"
 

lib/json/json_internal.h

@@ -34,19 +34,9 @@
 #ifndef SPDK_JSON_INTERNAL_H_
 #define SPDK_JSON_INTERNAL_H_
 
+#include "spdk/stdinc.h"
+
 #include "spdk/json.h"
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
 #include "spdk/likely.h"
 #include "spdk/string.h"
 

lib/jsonrpc/jsonrpc_internal.h

@@ -34,19 +34,10 @@
 #ifndef SPDK_JSONRPC_INTERNAL_H_
 #define SPDK_JSONRPC_INTERNAL_H_
 
+#include "spdk/stdinc.h"
+
 #include "spdk/jsonrpc.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <poll.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
 #include "spdk_internal/log.h"
 
 #define SPDK_JSONRPC_RECV_BUF_SIZE	(32 * 1024)

lib/log/log.c

@@ -31,16 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk_internal/log.h"
+#include "spdk/stdinc.h"
 
-#include <stdarg.h>
+#include "spdk_internal/log.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <syslog.h>
-#include <ctype.h>
-#include <errno.h>
 
 static TAILQ_HEAD(, spdk_trace_flag) g_trace_flags = TAILQ_HEAD_INITIALIZER(g_trace_flags);
 

lib/net/interface.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/log.h"
 #include "spdk/net.h"
@@ -40,19 +40,9 @@
 
 #ifdef __linux__ /* Interface management is Linux-specific */
 
-#include <stdio.h>
-#include <string.h>
-#include <netinet/in.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <net/if.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <pthread.h>
-#include <assert.h>
 
 
 static TAILQ_HEAD(, spdk_interface) g_interface_head;

lib/net/net_rpc.c

@@ -31,10 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <string.h>
+#include "spdk/stdinc.h"
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include "spdk/rpc.h"
 #include "spdk/net.h"

lib/net/sock.c

@@ -31,18 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <errno.h>
+#include "spdk/stdinc.h"
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
 #include "spdk/event.h"
 #include "spdk/log.h"

lib/nvme/nvme_ctrlr.c

@@ -31,9 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "nvme_internal.h"
+
 #include "spdk/env.h"
-#include <signal.h>
 
 static int nvme_ctrlr_construct_and_submit_aer(struct spdk_nvme_ctrlr *ctrlr,
 		struct nvme_async_event_request *aer);

lib/nvme/nvme_internal.h

@@ -34,25 +34,14 @@
 #ifndef __NVME_INTERNAL_H__
 #define __NVME_INTERNAL_H__
 
-#include "spdk/nvme.h"
+#include "spdk/stdinc.h"
 
-#include <errno.h>
+#include "spdk/nvme.h"
-#include <pthread.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
 
 #if defined(__i386__) || defined(__x86_64__)
 #include <x86intrin.h>
 #endif
 
-#include <sys/user.h>
-
 #include "spdk/queue.h"
 #include "spdk/barrier.h"
 #include "spdk/bit_array.h"

lib/nvme/nvme_pcie.c

@@ -35,10 +35,7 @@
  * NVMe over PCIe transport
  */
 
-#include <sys/mman.h>
+#include "spdk/stdinc.h"
-#include <signal.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
 
 #include "spdk/likely.h"
 #include "nvme_internal.h"

lib/nvme/nvme_rdma.c

@@ -35,17 +35,11 @@
  * NVMe over RDMA transport
  */
 
-#include <arpa/inet.h>
+#include "spdk/stdinc.h"
-#include <fcntl.h>
+
 #include <infiniband/verbs.h>
 #include <rdma/rdma_cma.h>
 #include <rdma/rdma_verbs.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <netdb.h>
 
 #include "spdk/assert.h"
 #include "spdk/log.h"

lib/nvme/nvme_uevent.c

@@ -31,22 +31,15 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "spdk/log.h"
 #include "spdk/event.h"
+
 #include "nvme_uevent.h"
 
 #ifdef __linux__
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <linux/netlink.h>
 
 #define SPDK_UEVENT_MSG_LEN 4096

lib/nvmf/discovery.c

@@ -35,8 +35,7 @@
  * NVMe over Fabrics discovery service
  */
 
-#include <ctype.h>
+#include "spdk/stdinc.h"
-#include <assert.h>
 
 #include "nvmf_internal.h"
 #include "session.h"

lib/nvmf/nvmf.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <arpa/inet.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/conf.h"
 #include "spdk/nvmf.h"

lib/nvmf/nvmf_internal.h

@@ -34,10 +34,7 @@
 #ifndef __NVMF_INTERNAL_H__
 #define __NVMF_INTERNAL_H__
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "spdk/nvmf_spec.h"
 #include "spdk/assert.h"

lib/nvmf/rdma.c

@@ -31,15 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <arpa/inet.h>
+#include "spdk/stdinc.h"
-#include <fcntl.h>
+
-#include <errno.h>
 #include <infiniband/verbs.h>
 #include <rdma/rdma_cma.h>
 #include <rdma/rdma_verbs.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdint.h>
 
 #include "nvmf_internal.h"
 #include "request.h"

lib/nvmf/request.c

@@ -31,7 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
 
 #include "nvmf_internal.h"
 #include "request.h"

lib/nvmf/session.c

@@ -31,9 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <arpa/inet.h>
+#include "spdk/stdinc.h"
-#include <stdint.h>
-#include <string.h>
 
 #include "session.h"
 #include "nvmf_internal.h"

lib/nvmf/session.h

@@ -34,8 +34,7 @@
 #ifndef NVMF_SESSION_H
 #define NVMF_SESSION_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
-#include <stdbool.h>
 
 #include "spdk/nvmf_spec.h"
 #include "spdk/queue.h"

lib/nvmf/subsystem.c

@@ -31,8 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctype.h>
+#include "spdk/stdinc.h"
-#include <assert.h>
 
 #include "nvmf_internal.h"
 #include "session.h"

lib/nvmf/transport.c

@@ -31,10 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "transport.h"
+#include "spdk/stdinc.h"
 
-#include <stdlib.h>
+#include "transport.h"
-#include <strings.h>
 
 #include "spdk/log.h"
 #include "spdk/nvmf.h"

lib/nvmf/transport.h

@@ -34,7 +34,7 @@
 #ifndef SPDK_NVMF_TRANSPORT_H
 #define SPDK_NVMF_TRANSPORT_H
 
-#include <stdint.h>
+#include "spdk/stdinc.h"
 
 #include "spdk/nvmf.h"
 

lib/nvmf/virtual.c

@@ -31,8 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <string.h>
+#include "spdk/stdinc.h"
-#include <stdlib.h>
 
 #include "subsystem.h"
 #include "session.h"

lib/rpc/rpc.c

@@ -31,20 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
 
 #include "spdk/queue.h"
 #include "spdk/rpc.h"

lib/scsi/scsi_internal.h

@@ -35,19 +35,7 @@
 #ifndef SPDK_SCSI_INTERNAL_H
 #define SPDK_SCSI_INTERNAL_H
 
-#include <assert.h>
+#include "spdk/stdinc.h"
-#include <ctype.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <pthread.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/uio.h>
 
 #include "spdk/bdev.h"
 #include "spdk/scsi.h"

lib/trace/trace.c

@@ -31,21 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "spdk/env.h"
 #include "spdk/trace.h"
 
-#include <assert.h>
-#include <stdint.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <errno.h>
-
 #include <rte_config.h>
 #include <rte_lcore.h>
 

lib/util/bit_array.c

@@ -31,17 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/stdinc.h"
+
 #include "spdk/bit_array.h"
 #include "spdk/env.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "spdk/likely.h"
 #include "spdk/util.h"
 

lib/util/fd.c

@@ -31,13 +31,9 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "spdk/fd.h"
+#include "spdk/stdinc.h"
 
-#include <sys/ioctl.h>
+#include "spdk/fd.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdint.h>
 
 #ifdef __linux__
 #include <linux/fs.h>

lib/util/io_channel.c

@@ -31,11 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdbool.h>
+#include "spdk/stdinc.h"
-#include <pthread.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "spdk/io_channel.h"
 #include "spdk/log.h"