diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp
index 1f1118a8779e72..fd1cd22995208c 100644
--- a/src/app/clusters/descriptor/descriptor.cpp
+++ b/src/app/clusters/descriptor/descriptor.cpp
@@ -15,10 +15,7 @@
  *    limitations under the License.
  */
 
-/****************************************************************************
- * @file
- * @brief Implementation for the Descriptor Server Cluster
- ***************************************************************************/
+#include "descriptor.h"
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
@@ -31,10 +28,8 @@
 #include <app/util/endpoint-config-api.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-
-#include "descriptor.h"
-#include "lib/core/CHIPError.h"
-#include "lib/core/DataModelTypes.h"
+#include <lib/core/CHIPError.h>
+#include <lib/core/DataModelTypes.h>
 
 using namespace chip;
 using namespace chip::app;
diff --git a/src/app/clusters/descriptor/descriptor.h b/src/app/clusters/descriptor/descriptor.h
index 8dd4ea745fcf66..c116a40604068e 100644
--- a/src/app/clusters/descriptor/descriptor.h
+++ b/src/app/clusters/descriptor/descriptor.h
@@ -14,6 +14,8 @@
  *    limitations under the License.
  */
 
+#include <cstdint>
+
 namespace chip {
 namespace app {
 namespace Clusters {