diff --git a/src/emu/emulator.h b/src/emu/emulator.h
index 1e513be2..01956f6b 100644
--- a/src/emu/emulator.h
+++ b/src/emu/emulator.h
@@ -9,8 +9,4 @@ void emu_run(struct emu *emu, const char *path);
 struct emu *emu_create(struct window *window);
 void emu_destroy(struct emu *emu);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/aica/aica.h b/src/hw/aica/aica.h
index 7c631bdc..907a10ee 100644
--- a/src/hw/aica/aica.h
+++ b/src/hw/aica/aica.h
@@ -13,8 +13,4 @@ void aica_destroy(struct aica *aica);
 AM_DECLARE(aica_reg_map);
 AM_DECLARE(aica_data_map);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/arm/arm.h b/src/hw/arm/arm.h
index 45181155..61d05e7a 100644
--- a/src/hw/arm/arm.h
+++ b/src/hw/arm/arm.h
@@ -14,8 +14,4 @@ void arm_destroy(struct arm *arm);
 
 AM_DECLARE(arm_data_map);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/gdrom/disc.h b/src/hw/gdrom/disc.h
index 6f301b11..3140f730 100644
--- a/src/hw/gdrom/disc.h
+++ b/src/hw/gdrom/disc.h
@@ -24,8 +24,4 @@ int disc_read_sector(struct disc *disc, int fad, void *dst);
 struct disc *disc_create_gdi(const char *filename);
 void disc_destroy(struct disc *disc);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/gdrom/gdrom.h b/src/hw/gdrom/gdrom.h
index 313bfc44..8cd84d8c 100644
--- a/src/hw/gdrom/gdrom.h
+++ b/src/hw/gdrom/gdrom.h
@@ -15,8 +15,4 @@ void gdrom_dma_end(struct gdrom *gd);
 struct gdrom *gdrom_create(struct dreamcast *dc);
 void gdrom_destroy(struct gdrom *gd);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/holly/holly.h b/src/hw/holly/holly.h
index 276c2b25..29892297 100644
--- a/src/hw/holly/holly.h
+++ b/src/hw/holly/holly.h
@@ -36,8 +36,4 @@ void holly_destroy(struct holly *hl);
 
 AM_DECLARE(holly_reg_map);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/holly/pvr.h b/src/hw/holly/pvr.h
index f5b5d815..ffef8c34 100644
--- a/src/hw/holly/pvr.h
+++ b/src/hw/holly/pvr.h
@@ -38,8 +38,4 @@ void pvr_destroy(struct pvr *pvr);
 AM_DECLARE(pvr_reg_map);
 AM_DECLARE(pvr_vram_map);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/hw/holly/ta.h b/src/hw/holly/ta.h
index 9aa0263e..a9d70e45 100644
--- a/src/hw/holly/ta.h
+++ b/src/hw/holly/ta.h
@@ -35,8 +35,4 @@ void ta_destroy(struct ta *ta);
 
 AM_DECLARE(ta_fifo_map);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif