replace stdint.h with cstdint

The former is deprecated by C++14. The standard says they are the same: The header defines all types and macros the same as the C standard library header<stdint.h>. Signed-off-by: Rosen Penev <rosenp@gmail.com>

replace stdint.h with cstdint
a2f5a63b · Rosen Penev · 2db8bcc3 · a2f5a63b · a2f5a63b · a2f5a63b
Unverified Commit a2f5a63b authored Mar 12, 2020 by Rosen Penev
85 changed files
--- a/src/MusicChunk.hxx
+++ b/src/MusicChunk.hxx
@@ -30,10 +30,9 @@
 #endif

 #include <cstddef>
+#include <cstdint>
 #include <memory>

-#include <stdint.h>
-
 static constexpr size_t CHUNK_SIZE = 4096;

 struct AudioFormat;

--- a/src/PlaylistPrint.hxx
+++ b/src/PlaylistPrint.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PLAYLIST_PRINT_HXX
 #define MPD_PLAYLIST_PRINT_HXX

-#include <stdint.h>
+#include <cstdint>

 struct playlist;
 class SongFilter;

--- a/src/ReplayGainMode.hxx
+++ b/src/ReplayGainMode.hxx
@@ -22,7 +22,7 @@

 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 enum class ReplayGainMode : uint8_t {
 	OFF,

--- a/src/SingleMode.hxx
+++ b/src/SingleMode.hxx
@@ -22,7 +22,7 @@

 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 enum class SingleMode : uint8_t {
 	OFF,

--- a/src/TagPrint.hxx
+++ b/src/TagPrint.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_PRINT_HXX
 #define MPD_TAG_PRINT_HXX

-#include <stdint.h>
+#include <cstdint>

 enum TagType : uint8_t;


--- a/src/db/Count.hxx
+++ b/src/db/Count.hxx
@@ -22,7 +22,7 @@

 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 enum TagType : uint8_t;
 struct Partition;

--- a/src/db/DatabasePrint.hxx
+++ b/src/db/DatabasePrint.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_DB_PRINT_H
 #define MPD_DB_PRINT_H

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;
 enum TagType : uint8_t;

--- a/src/db/update/InotifySource.cxx
+++ b/src/db/update/InotifySource.cxx
@@ -26,9 +26,9 @@

 #include <cerrno>
 #include <climits>
+#include <cstdint>

 #include <sys/inotify.h>
-#include <stdint.h>

 bool
 InotifySource::OnSocketReady(gcc_unused unsigned flags) noexcept

--- a/src/decoder/Client.hxx
+++ b/src/decoder/Client.hxx
@@ -25,7 +25,7 @@
 #include "input/Ptr.hxx"
 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 struct AudioFormat;
 struct Tag;

--- a/src/decoder/Command.hxx
+++ b/src/decoder/Command.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_DECODER_COMMAND_HXX
 #define MPD_DECODER_COMMAND_HXX

-#include <stdint.h>
+#include <cstdint>

 enum class DecoderCommand : uint8_t {
 	NONE = 0,

--- a/src/decoder/Control.hxx
+++ b/src/decoder/Control.hxx
@@ -32,12 +32,11 @@
 #include "ReplayGainMode.hxx"

 #include <cassert>
+#include <cstdint>
 #include <exception>
 #include <memory>
 #include <utility>

-#include <stdint.h>
-
 /* damn you, windows.h! */
 #ifdef ERROR
 #undef ERROR

--- a/src/decoder/DecoderAPI.hxx
+++ b/src/decoder/DecoderAPI.hxx
@@ -42,7 +42,7 @@

 // IWYU pragma: end_exports

-#include <stdint.h>
+#include <cstdint>

 /**
 * Throw an instance of this class to stop decoding the current song

--- a/src/decoder/DecoderBuffer.hxx
+++ b/src/decoder/DecoderBuffer.hxx
@@ -25,8 +25,7 @@
 #include "util/ConstBuffer.hxx"

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 class DecoderClient;
 class InputStream;

--- a/src/decoder/plugins/DsdLib.hxx
+++ b/src/decoder/plugins/DsdLib.hxx
@@ -24,7 +24,7 @@
 #include "input/Offset.hxx"
 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 class TagHandler;
 class DecoderClient;

--- a/src/decoder/plugins/FfmpegIo.hxx
+++ b/src/decoder/plugins/FfmpegIo.hxx
@@ -24,7 +24,7 @@ extern "C" {
 #include "libavformat/avio.h"
 }

-#include <stdint.h>
+#include <cstdint>

 class DecoderClient;
 class InputStream;

--- a/src/decoder/plugins/OpusHead.cxx
+++ b/src/decoder/plugins/OpusHead.cxx
@@ -19,7 +19,7 @@

 #include "OpusHead.hxx"

-#include <stdint.h>
+#include <cstdint>

 struct OpusHead {
 	char signature[8];

--- a/src/decoder/plugins/OpusReader.hxx
+++ b/src/decoder/plugins/OpusReader.hxx
@@ -23,8 +23,8 @@
 #include "util/StringView.hxx"

 #include <algorithm>
+#include <cstdint>

-#include <stdint.h>
 #include <string.h>

 class OpusReader {

--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@@ -28,7 +28,7 @@
 #include "util/NumberParser.hxx"
 #include "util/StringView.hxx"

-#include <stdint.h>
+#include <cstdint>

 gcc_pure
 static TagType

--- a/src/event/BufferedSocket.hxx
+++ b/src/event/BufferedSocket.hxx
@@ -24,10 +24,9 @@
 #include "util/StaticFifoBuffer.hxx"

 #include <cassert>
+#include <cstdint>
 #include <exception>

-#include <stdint.h>
-
 class EventLoop;

 /**

--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@@ -53,10 +53,10 @@
 #include "util/WritableBuffer.hxx"

 #include <array>
+#include <cstdint>
 #include <stdexcept>

 #include <string.h>
-#include <stdint.h>
 #include <stdlib.h>

 class RouteFilter final : public Filter {

--- a/src/fs/FileInfo.hxx
+++ b/src/fs/FileInfo.hxx
@@ -30,8 +30,7 @@
 #endif

 #include <chrono>
-
-#include <stdint.h>
+#include <cstdint>

 class FileInfo {
 	friend bool GetFileInfo(Path path, FileInfo &info,

--- a/src/fs/io/BufferedReader.cxx
+++ b/src/fs/io/BufferedReader.cxx
@@ -31,9 +31,9 @@
 #include "Reader.hxx"
 #include "util/TextFile.hxx"

+#include <cstdint>
 #include <stdexcept>

-#include <stdint.h>
 #include <string.h>

 bool

--- a/src/fs/io/FileOutputStream.hxx
+++ b/src/fs/io/FileOutputStream.hxx
@@ -39,8 +39,7 @@
 #endif

 #include <cassert>
-
-#include <stdint.h>
+#include <cstdint>

 #ifdef _WIN32
 #include <windows.h>

--- a/src/fs/io/PeekReader.hxx
+++ b/src/fs/io/PeekReader.hxx
@@ -22,7 +22,7 @@

 #include "Reader.hxx"

-#include <stdint.h>
+#include <cstdint>

 /**
 * A filter that allows the caller to peek the first few bytes without

--- a/src/input/Offset.hxx
+++ b/src/input/Offset.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_OFFSET_HXX
 #define MPD_OFFSET_HXX

-#include <stdint.h>
+#include <cstdint>

 /**
 * A type for absolute offsets in a file.

--- a/src/input/ThreadInputStream.hxx
+++ b/src/input/ThreadInputStream.hxx
@@ -27,10 +27,9 @@
 #include "util/CircularBuffer.hxx"

 #include <cassert>
+#include <cstdint>
 #include <exception>

-#include <stdint.h>
-
 /**
 * Helper class for moving InputStream implementations with blocking
 * backend library implementation to a dedicated thread.  Data is

--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@@ -35,9 +35,9 @@
 #include "config/Block.hxx"

 #include <cassert>
+#include <cstdint>

 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>


--- a/src/lib/alsa/PeriodBuffer.hxx
+++ b/src/lib/alsa/PeriodBuffer.hxx
@@ -24,8 +24,7 @@

 #include <algorithm>
 #include <cassert>
-
-#include <stdint.h>
+#include <cstdint>

 namespace Alsa {


--- a/src/lib/alsa/Version.hxx
+++ b/src/lib/alsa/Version.hxx
@@ -22,7 +22,7 @@

 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 static constexpr uint_least32_t
 MakeAlsaVersion(uint_least32_t major, uint_least32_t minor,

--- a/src/lib/chromaprint/DecoderClient.hxx
+++ b/src/lib/chromaprint/DecoderClient.hxx
@@ -24,11 +24,10 @@
 #include "decoder/Client.hxx"
 #include "thread/Mutex.hxx"

+#include <cstdint>
 #include <exception>
 #include <memory>

-#include <stdint.h>
-
 class PcmConvert;

 class ChromaprintDecoderClient : public DecoderClient {

--- a/src/lib/crypto/MD5.hxx
+++ b/src/lib/crypto/MD5.hxx
@@ -34,8 +34,7 @@
 #include "util/Compiler.h"

 #include <array>
-
-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/lib/ffmpeg/Time.hxx
+++ b/src/lib/ffmpeg/Time.hxx
@@ -29,8 +29,7 @@ extern "C" {
 }

 #include <cassert>
-
-#include <stdint.h>
+#include <cstdint>

 /* suppress the ffmpeg compatibility macro */
 #ifdef SampleFormat

--- a/src/lib/gcrypt/MD5.hxx
+++ b/src/lib/gcrypt/MD5.hxx
@@ -34,8 +34,7 @@
 #include "util/Compiler.h"

 #include <array>
-
-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
@@ -26,10 +26,10 @@
 #include "util/Compiler.h"

 #include <cstddef>
+#include <cstdint>
 #include <exception>
 #include <string>

-#include <stdint.h>
 #include <sys/stat.h>

 struct nfsfh;

--- a/src/lib/xiph/OggPage.hxx
+++ b/src/lib/xiph/OggPage.hxx
@@ -23,9 +23,9 @@
 #include <ogg/ogg.h>

 #include <cassert>
+#include <cstdint>

 #include <string.h>
-#include <stdint.h>

 static size_t
 ReadPage(const ogg_page &page, void *_buffer, size_t size) noexcept

--- a/src/lib/xiph/OggStreamState.hxx
+++ b/src/lib/xiph/OggStreamState.hxx
@@ -23,9 +23,9 @@
 #include <ogg/ogg.h>

 #include <cassert>
+#include <cstdint>

 #include <string.h>
-#include <stdint.h>

 class OggStreamState {
 	ogg_stream_state state;

--- a/src/lib/xiph/OggSyncState.hxx
+++ b/src/lib/xiph/OggSyncState.hxx
@@ -23,8 +23,7 @@
 #include <ogg/ogg.h>

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 class Reader;


--- a/src/net/IPv4Address.hxx
+++ b/src/net/IPv4Address.hxx
@@ -33,7 +33,7 @@
 #include "SocketAddress.hxx"
 #include "util/ByteOrder.hxx"

-#include <stdint.h>
+#include <cstdint>

 #ifdef _WIN32
 #include <winsock2.h>

--- a/src/net/IPv6Address.hxx
+++ b/src/net/IPv6Address.hxx
@@ -34,7 +34,7 @@
 #include "util/ByteOrder.hxx"
 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 #ifdef _WIN32
 #include <winsock2.h>

--- a/src/output/Control.hxx
+++ b/src/output/Control.hxx
@@ -28,12 +28,11 @@
 #include "system/PeriodClock.hxx"
 #include "util/Compiler.h"

+#include <cstdint>
 #include <exception>
+#include <map>
 #include <memory>
 #include <string>
-#include <map>
-
-#include <stdint.h>

 enum class ReplayGainMode : uint8_t;
 struct FilteredAudioOutput;

--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
@@ -29,11 +29,10 @@
 #include "util/ConstBuffer.hxx"

 #include <cassert>
+#include <cstdint>
 #include <memory>
 #include <utility>

-#include <stdint.h>
-
 struct MusicChunk;
 struct Tag;
 class Filter;

--- a/src/output/plugins/httpd/Page.hxx
+++ b/src/output/plugins/httpd/Page.hxx
@@ -23,8 +23,8 @@
 #include "util/AllocatedArray.hxx"

 #include <cstddef>
+#include <cstdint>
 #include <memory>
-#include <stdint.h>

 /**
 * A dynamically allocated buffer.  It is used to pass

--- a/src/pcm/Buffer.hxx
+++ b/src/pcm/Buffer.hxx
@@ -23,7 +23,7 @@
 #include "util/ReusableArray.hxx"
 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 /**
 * Manager for a temporary buffer which grows as needed.  We could

--- a/src/pcm/Clamp.hxx
+++ b/src/pcm/Clamp.hxx
@@ -22,10 +22,9 @@

 #include "util/Compiler.h"

+#include <cstdint>
 #include <limits>

-#include <stdint.h>
-
 enum class SampleFormat : uint8_t;
 template<SampleFormat F> struct SampleTraits;


--- a/src/pcm/Dither.hxx
+++ b/src/pcm/Dither.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PCM_DITHER_HXX
 #define MPD_PCM_DITHER_HXX

-#include <stdint.h>
+#include <cstdint>

 enum class SampleFormat : uint8_t;


--- a/src/pcm/Dop.hxx
+++ b/src/pcm/Dop.hxx
@@ -23,7 +23,7 @@
 #include "Buffer.hxx"
 #include "RestBuffer.hxx"

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/pcm/Dsd16.hxx
+++ b/src/pcm/Dsd16.hxx
@@ -23,7 +23,7 @@
 #include "Buffer.hxx"
 #include "RestBuffer.hxx"

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/pcm/Dsd2Pcm.hxx
+++ b/src/pcm/Dsd2Pcm.hxx
@@ -35,8 +35,7 @@ or implied, of Sebastian Gesemann.

 #include <array>
 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 /**
 * A "dsd2pcm engine" for one channel.

--- a/src/pcm/Dsd32.hxx
+++ b/src/pcm/Dsd32.hxx
@@ -23,7 +23,7 @@
 #include "Buffer.hxx"
 #include "RestBuffer.hxx"

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/pcm/Export.hxx
+++ b/src/pcm/Export.hxx
@@ -30,7 +30,7 @@
 #include "Dop.hxx"
 #endif

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/pcm/Interleave.hxx
+++ b/src/pcm/Interleave.hxx
@@ -23,7 +23,7 @@
 #include "util/Compiler.h"
 #include "util/ConstBuffer.hxx"

-#include <stdint.h>
+#include <cstdint>

 /**
 * Interleave planar PCM samples from #src to #dest.

--- a/src/pcm/Pack.hxx
+++ b/src/pcm/Pack.hxx
@@ -25,7 +25,7 @@
 #ifndef PCM_PACK_HXX
 #define PCM_PACK_HXX

-#include <stdint.h>
+#include <cstdint>

 /**
 * Converts padded 24 bit samples (4 bytes per sample) to packed 24

--- a/src/pcm/PcmChannels.hxx
+++ b/src/pcm/PcmChannels.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PCM_CHANNELS_HXX
 #define MPD_PCM_CHANNELS_HXX

-#include <stdint.h>
+#include <cstdint>

 class PcmBuffer;
 template<typename T> struct ConstBuffer;

--- a/src/pcm/PcmDsd.hxx
+++ b/src/pcm/PcmDsd.hxx
@@ -23,7 +23,7 @@
 #include "Buffer.hxx"
 #include "Dsd2Pcm.hxx"

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;


--- a/src/pcm/PcmFormat.hxx
+++ b/src/pcm/PcmFormat.hxx
@@ -22,7 +22,7 @@

 #include "SampleFormat.hxx"

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct ConstBuffer;
 class PcmBuffer;

--- a/src/pcm/SampleFormat.hxx
+++ b/src/pcm/SampleFormat.hxx
@@ -22,7 +22,7 @@

 #include "util/Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 #if defined(_WIN32)
 /* on WIN32, "FLOAT" is already defined, and this triggers -Wshadow */

--- a/src/pcm/Silence.hxx
+++ b/src/pcm/Silence.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PCM_SILENCE_HXX
 #define MPD_PCM_SILENCE_HXX

-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct WritableBuffer;
 enum class SampleFormat : uint8_t;

--- a/src/pcm/Traits.hxx
+++ b/src/pcm/Traits.hxx
@@ -23,8 +23,7 @@
 #include "SampleFormat.hxx"

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 /**
 * This template describes the specified #SampleFormat.  This is an

--- a/src/pcm/Volume.cxx
+++ b/src/pcm/Volume.cxx
@@ -28,8 +28,8 @@
 #include "Dither.cxx" // including the .cxx file to get inlined templates

 #include <cassert>
+#include <cstdint>

-#include <stdint.h>
 #include <string.h>

 #if GCC_OLDER_THAN(8,0)

--- a/src/player/Control.hxx
+++ b/src/player/Control.hxx
@@ -31,11 +31,10 @@
 #include "ReplayGainMode.hxx"
 #include "MusicChunkPtr.hxx"

+#include <cstdint>
 #include <exception>
 #include <memory>

-#include <stdint.h>
-
 struct Tag;
 class PlayerListener;
 class PlayerOutputs;

--- a/src/protocol/ArgParser.hxx
+++ b/src/protocol/ArgParser.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_PROTOCOL_ARGPARSER_HXX
 #define MPD_PROTOCOL_ARGPARSER_HXX

-#include <stdint.h>
+#include <cstdint>

 struct RangeArg;
 class SongTime;

--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
@@ -26,10 +26,9 @@
 #include "util/LazyRandomEngine.hxx"

 #include <cassert>
+#include <cstdint>
 #include <utility>

-#include <stdint.h>
-
 class DetachedSong;

 /**

--- a/src/queue/QueuePrint.hxx
+++ b/src/queue/QueuePrint.hxx
@@ -25,7 +25,7 @@
 #ifndef MPD_QUEUE_PRINT_HXX
 #define MPD_QUEUE_PRINT_HXX

-#include <stdint.h>
+#include <cstdint>

 struct Queue;
 class SongFilter;

--- a/src/song/Filter.hxx
+++ b/src/song/Filter.hxx
@@ -23,10 +23,9 @@
 #include "AndSongFilter.hxx"
 #include "util/Compiler.h"

+#include <cstdint>
 #include <string>

-#include <stdint.h>
-
 /**
 * Special value for the db_selection_print() sort parameter.
 */

--- a/src/song/TagSongFilter.hxx
+++ b/src/song/TagSongFilter.hxx
@@ -23,7 +23,7 @@
 #include "ISongFilter.hxx"
 #include "StringFilter.hxx"

-#include <stdint.h>
+#include <cstdint>

 enum TagType : uint8_t;
 struct Tag;

--- a/src/storage/FileInfo.hxx
+++ b/src/storage/FileInfo.hxx
@@ -22,7 +22,7 @@

 #include <chrono>

-#include <stdint.h>
+#include <cstdint>

 struct StorageFileInfo {
 	enum class Type : uint8_t {

--- a/src/system/EpollFD.hxx
+++ b/src/system/EpollFD.hxx
@@ -32,8 +32,9 @@

 #include "UniqueFileDescriptor.hxx"

+#include <cstdint>
+
 #include <sys/epoll.h>
-#include <stdint.h>

 /**
 * A class that wraps Linux epoll.

--- a/src/system/FileDescriptor.cxx
+++ b/src/system/FileDescriptor.cxx
@@ -31,8 +31,8 @@
 #include "system/Error.hxx"

 #include <cassert>
+#include <cstdint>

-#include <stdint.h>
 #include <sys/stat.h>
 #include <fcntl.h>


--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -21,10 +21,10 @@
 #include "input/InputStream.hxx"
 #include "util/ByteOrder.hxx"

+#include <cstdint>
 #include <limits>
 #include <stdexcept>

-#include <stdint.h>
 #include <string.h>

 struct aiff_header {

--- a/src/tag/ApeLoader.cxx
+++ b/src/tag/ApeLoader.cxx
@@ -23,9 +23,9 @@
 #include "util/StringView.hxx"

 #include <cassert>
+#include <cstdint>
 #include <memory>

-#include <stdint.h>
 #include <string.h>

 struct ApeFooter {

--- a/src/tag/Id3Picture.cxx
+++ b/src/tag/Id3Picture.cxx
@@ -23,10 +23,9 @@
 #include "util/ConstBuffer.hxx"
 #include "util/StringView.hxx"

+#include <cstdint>
 #include <string>

-#include <stdint.h>
-
 static StringView
 ReadString(ConstBuffer<uint8_t> &src) noexcept
 {

--- a/src/tag/Mask.hxx
+++ b/src/tag/Mask.hxx
@@ -22,7 +22,7 @@

 #include "Type.h"

-#include <stdint.h>
+#include <cstdint>

 class TagMask {
 	typedef uint_least32_t mask_t;

--- a/src/tag/Pool.cxx
+++ b/src/tag/Pool.cxx
@@ -24,11 +24,11 @@
 #include "util/StringView.hxx"

 #include <cassert>
+#include <cstdint>
 #include <limits>

 #include <string.h>
 #include <stdlib.h>
-#include <stdint.h>

 Mutex tag_pool_lock;


--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -21,10 +21,10 @@
 #include "input/InputStream.hxx"
 #include "util/ByteOrder.hxx"

+#include <cstdint>
 #include <limits>
 #include <stdexcept>

-#include <stdint.h>
 #include <string.h>

 struct riff_header {

--- a/src/tag/Rva2.cxx
+++ b/src/tag/Rva2.cxx
@@ -22,7 +22,8 @@

 #include <id3tag.h>

-#include <stdint.h>
+#include <cstdint>
+
 #include <string.h>

 enum class Rva2Channel : uint8_t {

--- a/src/tag/Type.h
+++ b/src/tag/Type.h
@@ -21,7 +21,7 @@
 #define MPD_TAG_TYPE_H

 #ifdef __cplusplus
-#include <stdint.h>
+#include <cstdint>
 #endif

 /**

--- a/src/time/FileTime.hxx
+++ b/src/time/FileTime.hxx
@@ -33,8 +33,7 @@
 #include <fileapi.h>

 #include <chrono>
-
-#include <stdint.h>
+#include <cstdint>

 constexpr uint64_t
 ConstructUint64(DWORD lo, DWORD hi) noexcept

--- a/src/util/BitReverse.hxx
+++ b/src/util/BitReverse.hxx
@@ -22,7 +22,7 @@

 #include "Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 /**
 * @see http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith64BitsDiv

--- a/src/util/ByteOrder.hxx
+++ b/src/util/ByteOrder.hxx
@@ -32,7 +32,7 @@

 #include "Compiler.h"

-#include <stdint.h>
+#include <cstdint>

 #if defined(__i386__) || defined(__x86_64__) || defined(__ARMEL__)
 /* well-known little-endian */

--- a/src/util/ByteReverse.hxx
+++ b/src/util/ByteReverse.hxx
@@ -21,8 +21,7 @@
 #define MPD_BYTE_REVERSE_HXX

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 /**
 * Reverse the bytes in each 16 bit "frame".  This function can be

--- a/src/util/HexFormat.hxx
+++ b/src/util/HexFormat.hxx
@@ -35,8 +35,7 @@
 #include "Compiler.h"

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 /**
 * Format the given byte sequence into a null-terminated hexadecimal

--- a/src/util/HugeAllocator.hxx
+++ b/src/util/HugeAllocator.hxx
@@ -103,7 +103,7 @@ HugeDiscard(void *p, size_t size) noexcept

 /* not Linux: fall back to standard C calls */

-#include <stdint.h>
+#include <cstdint>

 static inline WritableBuffer<void>
 HugeAllocate(size_t size)

--- a/src/util/NumberParser.hxx
+++ b/src/util/NumberParser.hxx
@@ -32,8 +32,8 @@
 #define NUMBER_PARSER_HXX

 #include <cassert>
+#include <cstdint>

-#include <stdint.h>
 #include <stdlib.h>

 struct StringView;

--- a/src/util/PeakBuffer.hxx
+++ b/src/util/PeakBuffer.hxx
@@ -23,8 +23,7 @@
 #include "Compiler.h"

 #include <cstddef>
-
-#include <stdint.h>
+#include <cstdint>

 template<typename T> struct WritableBuffer;
 template<typename T> class DynamicFifoBuffer;

--- a/src/util/UTF8.cxx
+++ b/src/util/UTF8.cxx
@@ -32,8 +32,7 @@
 #include "CharUtil.hxx"

 #include <algorithm>
-
-#include <stdint.h>
+#include <cstdint>

 /**
 * Is this a leading byte that is followed by 1 continuation byte?