diff --git a/src/MicronDmaInputFilter.cc b/src/MicronDmaInputFilter.cc
index 71d2bec1e248a26c17b213a10e8587c7287ea6b8..01d17a28ed7af3e15dca01fb83537eab36f5e321 100644
--- a/src/MicronDmaInputFilter.cc
+++ b/src/MicronDmaInputFilter.cc
@@ -1,7 +1,6 @@
 #include "MicronDmaInputFilter.h"
 
-#include <ctype.h>
-
+#include <cctype>
 #include <cstring>
 #include <system_error>
 
diff --git a/src/OutputByOrbit.cc b/src/OutputByOrbit.cc
index 0692f128b7e16129b96749bb93b6833a23115b1b..e286bf0267bc359362ce78c8561c677893dbbf20 100644
--- a/src/OutputByOrbit.cc
+++ b/src/OutputByOrbit.cc
@@ -1,7 +1,6 @@
 #include "OutputByOrbit.h"
 
-#include <stdio.h>
-
+#include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <string>
diff --git a/src/OutputByOrbit.h b/src/OutputByOrbit.h
index f08c8d7e7b8b9f5ceba52cac959ad4e18fd69fb2..cc50d242609273aa703a4ef3e5e6cfef537ddbb1 100644
--- a/src/OutputByOrbit.h
+++ b/src/OutputByOrbit.h
@@ -1,9 +1,9 @@
 #ifndef OUTPUTBYORBIT_H
 #define OUTPUTBYORBIT_H
 
-#include <stdint.h>
 #include <tbb/pipeline.h>
 
+#include <cstdint>
 #include <cstdio>
 #include <string>
 
diff --git a/src/OutputBySize.cc b/src/OutputBySize.cc
index 05677b7ed262876af9d153e2925d72d758af78dc..384840b615e8f437ef5d777100ae34f4e45153b0 100644
--- a/src/OutputBySize.cc
+++ b/src/OutputBySize.cc
@@ -1,7 +1,6 @@
 #include "OutputBySize.h"
 
-#include <stdio.h>
-
+#include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <string>
diff --git a/src/OutputBySize.h b/src/OutputBySize.h
index eadfc9cef071ec66633960d6b7e9a695b28cfbd6..c5818334cec7597281c15ec4149534f4b5f264cf 100644
--- a/src/OutputBySize.h
+++ b/src/OutputBySize.h
@@ -1,9 +1,9 @@
 #ifndef OUTPUTBYSIZE_H
 #define OUTPUTBYSIZE_H
 
-#include <stdint.h>
 #include <tbb/pipeline.h>
 
+#include <cstdint>
 #include <cstdio>
 #include <string>
 
diff --git a/src/bril_histo.h b/src/bril_histo.h
index 7c2aa3a1513391f3f609b9472d4bfb057aa84800..cda6dd8d6a2875af72043a32c32b0b0cc961333a 100644
--- a/src/bril_histo.h
+++ b/src/bril_histo.h
@@ -1,6 +1,8 @@
 #ifndef BRIL_HISTO_H
 #define BRIL_HISTO_H
 
+#include <tbb/pipeline.h>
+
 #include <atomic>
 #include <fstream>
 #include <iostream>
@@ -10,7 +12,6 @@
 #include <vector>
 
 #include "controls.h"
-#include <tbb/pipeline.h>
 
 template <typename T>
 class BrilHistoQueue {
diff --git a/src/config.h b/src/config.h
index f4181d1c19aeecb87e642c8a961fd6e92b47ea35..37f55d9d5efb0c8bc0563994e5a402a526ef0dea 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,9 +1,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <stdint.h>
-
 #include <boost/lexical_cast.hpp>
+#include <cstdint>
 #include <map>
 #include <stdexcept>
 #include <string>
diff --git a/src/controls.h b/src/controls.h
index 0ecb15569b54af25a1bc7ba5be1bd9fcd7706822..f3bc5da11810605bdcedc1eb460e6b1e55ec46f4 100644
--- a/src/controls.h
+++ b/src/controls.h
@@ -1,8 +1,7 @@
 #ifndef CONTROLS_H
 #define CONTROLS_H
-#include <stdint.h>
-
 #include <atomic>
+#include <cstdint>
 #include <string>
 
 struct ctrl {
diff --git a/src/format.h b/src/format.h
index dd0ccab86c00e8685937dc12e893d186835fd3e7..83826773812015b7395141cd26a8de083cbeec09 100644
--- a/src/format.h
+++ b/src/format.h
@@ -1,8 +1,8 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include <math.h>
-#include <stdint.h>
+#include <cmath>
+#include <cstdint>
 
 struct blockCalo {
   uint32_t calo0[8];
diff --git a/src/slice.h b/src/slice.h
index 5b979ee7d929ee05b8b18d30ca34b69b882017d1..1ab4016cbee795e6b749c1c1a6198ffe7a3ff1b0 100644
--- a/src/slice.h
+++ b/src/slice.h
@@ -1,11 +1,11 @@
 #ifndef SLICE_H
 #define SLICE_H
 
-#include <stdint.h>
-
 #include <tbb/concurrent_queue.h>
 #include <tbb/scalable_allocator.h>
 
+#include <cstdint>
+
 //! Holds a slice of data.
 class Slice {
   //! Pointer to one past last filled byte in sequence
diff --git a/src/tools.h b/src/tools.h
index db68ba46f4f5691f00276e92a49489a5891f0b09..a1734ccad8e7e3b6387ae6c7135f2aa4c04b01a8 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -6,10 +6,10 @@
  */
 
 #include <curl/curl.h>
-#include <limits.h>
 #include <sys/stat.h>
 #include <unistd.h>  // TODO: This could eventually be replaced by chrono and thread when we move to a more modern C++ compiler.
 
+#include <climits>
 #include <cstring>
 #include <iostream>
 
diff --git a/src/wzdma/wz-xdma-ioctl.h b/src/wzdma/wz-xdma-ioctl.h
index 60fd5b5075f957e19a0bbc0350f2994b4bf28628..bb4ef248e8a9872c87360b1656d231cc1e1d826e 100644
--- a/src/wzdma/wz-xdma-ioctl.h
+++ b/src/wzdma/wz-xdma-ioctl.h
@@ -1,10 +1,11 @@
 #ifndef WZ_XDMA_IOCTL_H
 #define WZ_XDMA_IOCTL_H 1
 
+#include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include "wz-xdma-consts.h"
-#include "stdint.h"
 
 // Structures used to notify the application about the received block of data
 // The block always starts at the first descriptor, and may and in the middle