diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c
index 800456140..df2986645 100755
--- a/src/main/target/NAZE/config.c
+++ b/src/main/target/NAZE/config.c
@@ -15,57 +15,20 @@
  * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include <platform.h>
 
-#include "build_config.h"
+#include "fc/rc_controls.h"
 
-#include "blackbox/blackbox_io.h"
-
-#include "common/color.h"
-#include "common/axis.h"
-#include "common/filter.h"
-
-#include "drivers/sensor.h"
-#include "drivers/accgyro.h"
-#include "drivers/system.h"
-#include "drivers/timer.h"
-#include "drivers/pwm_rx.h"
-#include "drivers/serial.h"
-#include "drivers/pwm_output.h"
-#include "drivers/io.h"
-#include "drivers/pwm_mapping.h"
-
-#include "sensors/sensors.h"
-#include "sensors/gyro.h"
-#include "sensors/acceleration.h"
-#include "sensors/barometer.h"
-#include "sensors/boardalignment.h"
-#include "sensors/battery.h"
-
-#include "io/beeper.h"
-#include "io/serial.h"
-#include "io/gimbal.h"
-#include "io/escservo.h"
-#include "io/rc_controls.h"
-#include "io/rc_curves.h"
-#include "io/ledstrip.h"
+#include "flight/failsafe.h"
+#include "flight/mixer.h"
+#include "flight/pid.h"
 
 #include "rx/rx.h"
 
-#include "telemetry/telemetry.h"
-
-#include "flight/mixer.h"
-#include "flight/pid.h"
-#include "flight/imu.h"
-#include "flight/failsafe.h"
-#include "flight/altitudehold.h"
-#include "flight/navigation.h"
-
-#include "config/runtime_config.h"
 #include "config/config.h"
-
 #include "config/config_profile.h"
 #include "config/config_master.h"
 
@@ -73,11 +36,11 @@
 // alternative defaults settings for Beebrain target
 void targetConfiguration(master_t *config)
 {
-    config->motor_pwm_rate = 4000;
+    config->motorConfig.motorPwmRate = 4000;
     config->failsafeConfig.failsafe_delay = 2;
     config->failsafeConfig.failsafe_off_delay = 0;
 
-    config->escAndServoConfig.minthrottle = 1049;
+    config->motorConfig.minthrottle = 1049;
 
     config->gyro_lpf = 1;
     config->gyro_soft_lpf_hz = 100;