diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 9df97aa16f804e955b17a72a19d23cf762e955b6..b4b1f1a3efbe88367c745023c713f6fd5bc702eb 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -52,7 +52,6 @@
 #include "MemoryPool.h"
 
 #include <cassert>
-#include <cstddef>
 #include <algorithm>
 
 using namespace CPlusPlus;
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index 9909493fd1a7698575fc0dee56b05ca08fae273a..d899ee086ac276c13f5ae0641aed2ff90e5839b4 100644
--- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
+++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
@@ -50,6 +50,7 @@
 #define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H
 
 #include <cstdlib>
+#include <cstddef>
 
 #ifndef CPLUSPLUS_WITHOUT_QT
 #  include <QtCore/qglobal.h>
diff --git a/src/shared/cplusplus/Control.h b/src/shared/cplusplus/Control.h
index c13719f2d597313a6c90c52d388b4efd5f7bd916..4d6cc73ce99ae154d29cf6ba0333d9ab68eda34b 100644
--- a/src/shared/cplusplus/Control.h
+++ b/src/shared/cplusplus/Control.h
@@ -50,8 +50,6 @@
 #define CPLUSPLUS_CONTROL_H
 
 #include "CPlusPlusForwardDeclarations.h"
-#include <cstddef>
-
 
 namespace CPlusPlus {
 
diff --git a/src/shared/cplusplus/CoreTypes.h b/src/shared/cplusplus/CoreTypes.h
index 3e2470857a234d9a6530a980ac7ea3b006b4a72c..ab729be28f64c8339149df26974497e0fde373dd 100644
--- a/src/shared/cplusplus/CoreTypes.h
+++ b/src/shared/cplusplus/CoreTypes.h
@@ -52,7 +52,6 @@
 #include "CPlusPlusForwardDeclarations.h"
 #include "Type.h"
 #include "FullySpecifiedType.h"
-#include <cstddef>
 
 namespace CPlusPlus {
 
diff --git a/src/shared/cplusplus/MemoryPool.h b/src/shared/cplusplus/MemoryPool.h
index 2f7cb920af3c39b0c8896987b70f7bb2f155f030..25ef445d73a5df76b0072493f1b36e1d322dcd76 100644
--- a/src/shared/cplusplus/MemoryPool.h
+++ b/src/shared/cplusplus/MemoryPool.h
@@ -50,7 +50,6 @@
 #define CPLUSPLUS_MEMORYPOOL_H
 
 #include "CPlusPlusForwardDeclarations.h"
-#include <cstddef>
 #include <new>
 
 namespace CPlusPlus {
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp
index e8b80fdcae915ee1c4c05dd92d025b6e5a65fc46..316fccaaecdb157ca35686f7d8740d0adfcd4871 100644
--- a/src/shared/cplusplus/Symbol.cpp
+++ b/src/shared/cplusplus/Symbol.cpp
@@ -56,7 +56,6 @@
 #include "SymbolVisitor.h"
 #include "NameVisitor.h"
 #include "Scope.h"
-#include <cstddef>
 #include <cassert>
 
 using namespace CPlusPlus;
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h
index fe984c8c040dc0aaa2fef68b1903e9baedfe75a5..3829baa651f1913c000a2d31425a727cc6caa876 100644
--- a/src/shared/cplusplus/Token.h
+++ b/src/shared/cplusplus/Token.h
@@ -50,8 +50,6 @@
 #define CPLUSPLUS_TOKEN_H
 
 #include "CPlusPlusForwardDeclarations.h"
-#include <cstddef>
-
 
 namespace CPlusPlus {