diff --git a/src/class/cdc/cdc.h b/src/class/cdc/cdc.h
index afac8379d..d07c62429 100644
--- a/src/class/cdc/cdc.h
+++ b/src/class/cdc/cdc.h
@@ -50,10 +50,6 @@
  extern "C" {
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpacked"
-#pragma GCC diagnostic ignored "-Wattributes"
-
 /** \defgroup ClassDriver_CDC_Common Common Definitions
  *  @{ */
 
@@ -406,8 +402,6 @@ typedef struct ATTR_PACKED
 
 TU_VERIFY_STATIC(sizeof(cdc_line_control_state_t) == 2, "size is not correct");
 
-#pragma GCC diagnostic pop
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h
index 0008e47fb..8bfede2da 100644
--- a/src/class/hid/hid.h
+++ b/src/class/hid/hid.h
@@ -49,10 +49,6 @@
  extern "C" {
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpacked"
-#pragma GCC diagnostic ignored "-Wattributes"
-
 //--------------------------------------------------------------------+
 // Common Definitions
 //--------------------------------------------------------------------+
@@ -613,8 +609,6 @@ enum
   HID_USAGE_CONSUMER_AC_PAN                            = 0x0238,
 };
 
-#pragma GCC diagnostic pop
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/msc/msc.h b/src/class/msc/msc.h
index e7c32b303..10a73bb1c 100644
--- a/src/class/msc/msc.h
+++ b/src/class/msc/msc.h
@@ -46,16 +46,12 @@
 #ifndef _TUSB_MSC_H_
 #define _TUSB_MSC_H_
 
-#include <common/tusb_common.h>
+#include "common/tusb_common.h"
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpacked"
-#pragma GCC diagnostic ignored "-Wattributes"
-
 //--------------------------------------------------------------------+
 // Mass Storage Class Constant
 //--------------------------------------------------------------------+
@@ -396,8 +392,6 @@ typedef struct ATTR_PACKED
 TU_VERIFY_STATIC(sizeof(scsi_read10_t) == 10, "size is not correct");
 TU_VERIFY_STATIC(sizeof(scsi_write10_t) == 10, "size is not correct");
 
-#pragma GCC diagnostic pop
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index 9c3c21b88..b11481b18 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -51,10 +51,6 @@
  extern "C" {
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpacked"
-#pragma GCC diagnostic ignored "-Wattributes"
-
 /*------------------------------------------------------------------*/
 /* CONSTANTS
  *------------------------------------------------------------------*/
@@ -427,8 +423,6 @@ static inline uint8_t descriptor_len(uint8_t const p_desc[])
 // Convert comma-separated string to descriptor unicode format
 #define TUD_DESC_STRCONV( ... )     (const uint16_t[]) { TUD_DESC_STR_HEADER(VA_ARGS_NUM_(__VA_ARGS__)), __VA_ARGS__ }
 
-#pragma GCC diagnostic pop
-
 #ifdef __cplusplus
  }
 #endif