diff --git a/src/platforms/common/timing.h b/src/platforms/common/timing.h
index 39b58e5..cc7971e 100644
--- a/src/platforms/common/timing.h
+++ b/src/platforms/common/timing.h
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __TIMING__H
+#ifndef __TIMING_H
 #define __TIMING_H
 
 struct platform_timeout {
@@ -26,5 +26,5 @@ struct platform_timeout {
 
 uint32_t platform_time_ms(void);
 
-#endif
+#endif /* __TIMING_H */
 
diff --git a/src/platforms/stm32/usbdfu.h b/src/platforms/stm32/usbdfu.h
index df68b85..3f5b3f8 100644
--- a/src/platforms/stm32/usbdfu.h
+++ b/src/platforms/stm32/usbdfu.h
@@ -17,6 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __USBDFU_H
+#define __USBDFU_H
+
 #include <libopencm3/usb/usbd.h>
 
 /* Commands sent with wBlockNum == 0 as per ST implementation. */
@@ -44,3 +47,4 @@ void dfu_event(void);
 /* Platform specific function */
 void dfu_detach(void);
 
+#endif /* __USBDFU_H */
diff --git a/src/target/adiv5.c b/src/target/adiv5.c
index d530ecb..3fa7673 100644
--- a/src/target/adiv5.c
+++ b/src/target/adiv5.c
@@ -78,7 +78,7 @@ enum cid_class {
 
 #ifdef PLATFORM_HAS_DEBUG
 /* The reserved ones only have an R in them, to save a bit of space. */
-static const char const *cidc_debug_strings[] =
+static const char * const cidc_debug_strings[] =
 {
 	[cidc_gvc] =     "Generic verification component",           /* 0x0 */
 	[cidc_romtab] =  "ROM Table",                                /* 0x1 */