diff --git a/conf/modules/boards/bebop.xml b/conf/modules/boards/bebop.xml
index f286771746..c4b04413e1 100644
--- a/conf/modules/boards/bebop.xml
+++ b/conf/modules/boards/bebop.xml
@@ -11,7 +11,7 @@
   </dep>
   <makefile target="!sim|nps|fbw">
     <configure name="MS5611_I2C_DEV" value="i2c1"/>
-    <define name="BARO_BOARD" value="BARO_MS5611_I2C"/>
+    <define name="MS5611_TYPE_MS5607" value="TRUE"/>
   </makefile>
 </module>
   
diff --git a/conf/modules/boards/bebop2.xml b/conf/modules/boards/bebop2.xml
index b23176ba8e..d865feed1a 100644
--- a/conf/modules/boards/bebop2.xml
+++ b/conf/modules/boards/bebop2.xml
@@ -11,7 +11,7 @@
   </dep>
   <makefile target="!sim|nps|fbw">
     <configure name="MS5611_I2C_DEV" value="i2c1"/>
-    <define name="BARO_BOARD" value="BARO_MS5611_I2C"/>
+    <define name="MS5611_TYPE_MS5607" value="TRUE"/>
   </makefile>
 </module>
 
diff --git a/conf/modules/boards/disco.xml b/conf/modules/boards/disco.xml
index 55fa3a36b8..2d404f86d5 100644
--- a/conf/modules/boards/disco.xml
+++ b/conf/modules/boards/disco.xml
@@ -10,6 +10,7 @@
     <depends>baro_ms5611_i2c</depends>
   </dep>
   <makefile target="!sim|nps|fbw">
+    <define name="MS5611_TYPE_MS5607" value="TRUE"/>
   </makefile>
 </module>
 
diff --git a/sw/airborne/boards/bebop/baro_board.h b/sw/airborne/boards/bebop/baro_board.h
deleted file mode 100644
index c0b4b019c9..0000000000
--- a/sw/airborne/boards/bebop/baro_board.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2014 Freek van Tienen <freek.v.tienen@gmail.com>
- *
- * This file is part of Paparazzi.
- *
- * Paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * Paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * @file boards/bebop/baro_board.h
- * Paparazzi Bebop Baro Sensor implementation for the MS5607.
- * Actually uses the MS5611 driver, but sets BB_MS5611_TYPE_MS5607 to TRUE.
- */
-
-#ifndef BOARDS_BEBOP_BARO_H
-#define BOARDS_BEBOP_BARO_H
-
-#define BB_MS5611_TYPE_MS5607 TRUE
-
-// only for printing the baro type during compilation
-#ifndef BARO_BOARD
-#define BARO_BOARD BARO_MS5611_I2C
-#endif
-
-extern void baro_event(void);
-#define BaroEvent baro_event
-
-#endif /* BOARDS_BEBOP_BARO_H */
diff --git a/sw/airborne/boards/disco/baro_board.h b/sw/airborne/boards/disco/baro_board.h
deleted file mode 100644
index aaae478913..0000000000
--- a/sw/airborne/boards/disco/baro_board.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 OpenUAS <info@openuas.org>
- *
- * This file is part of Paparazzi.
- *
- * Paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * Paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * @file boards/disco/baro_board.h
- * Paparazzi Disco Baro Sensor implementation for the MS5607.
- * Actually uses the MS5611 driver, but sets BB_MS5611_TYPE_MS5607 to TRUE.
- */
-
-#ifndef BOARDS_DISCO_BARO_H
-#define BOARDS_DISCO_BARO_H
-
-#define BB_MS5611_TYPE_MS5607 TRUE
-
-// only for printing the baro type during compilation
-#ifndef BARO_BOARD
-#define BARO_BOARD BARO_MS5611_I2C
-#endif
-
-extern void baro_event(void);
-#define BaroEvent baro_event
-
-#endif /* BOARDS_DISCO_BARO_H */
diff --git a/sw/airborne/modules/sensors/baro_ms5611_i2c.c b/sw/airborne/modules/sensors/baro_ms5611_i2c.c
index 335ea656ba..7e8734d413 100644
--- a/sw/airborne/modules/sensors/baro_ms5611_i2c.c
+++ b/sw/airborne/modules/sensors/baro_ms5611_i2c.c
@@ -50,7 +50,7 @@
 #ifndef MS5611_TYPE_MS5607
 #define MS5611_TYPE_MS5607 FALSE
 #endif
-PRINT_CONFIG_VAR(BB_MS5611_TYPE_MS5607)
+PRINT_CONFIG_VAR(MS5611_TYPE_MS5607)
 
 struct Ms5611_I2c baro_ms5611;