diff --git a/code/espurna/homeassistant.cpp b/code/espurna/homeassistant.cpp
index 9d93d593..e42a2336 100644
--- a/code/espurna/homeassistant.cpp
+++ b/code/espurna/homeassistant.cpp
@@ -10,9 +10,6 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if HOMEASSISTANT_SUPPORT
 
-#include <Ticker.h>
-#include <Schedule.h>
-
 #include "light.h"
 #include "mqtt.h"
 #include "relay.h"
@@ -21,6 +18,11 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 #include "utils.h"
 #include "ws.h"
 
+#include <Ticker.h>
+#include <Schedule.h>
+
+#include <ArduinoJson.h>
+
 bool _ha_enabled = false;
 bool _ha_send_flag = false;
 
diff --git a/code/espurna/homeassistant.h b/code/espurna/homeassistant.h
index a790fb05..69715aac 100644
--- a/code/espurna/homeassistant.h
+++ b/code/espurna/homeassistant.h
@@ -10,12 +10,4 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #include "espurna.h"
 
-#if HOMEASSISTANT_SUPPORT
-
-#include <ArduinoJson.h>
-
-struct ha_config_t;
-
 void haSetup();
-
-#endif // HOMEASSISTANT_SUPPORT == 1
diff --git a/code/espurna/i2c.cpp b/code/espurna/i2c.cpp
index 65d89a11..e72451c3 100644
--- a/code/espurna/i2c.cpp
+++ b/code/espurna/i2c.cpp
@@ -10,9 +10,11 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if I2C_SUPPORT
 
+#include <Wire.h>
 unsigned int _i2c_locked[16] = {0};
 
 #if I2C_USE_BRZO
+#include <brzo_i2c.h>
 unsigned long _i2c_scl_frequency = 0;
 #endif
 
diff --git a/code/espurna/i2c.h b/code/espurna/i2c.h
index d5b574ff..caabce67 100644
--- a/code/espurna/i2c.h
+++ b/code/espurna/i2c.h
@@ -10,14 +10,6 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #include "espurna.h"
 
-#if I2C_SUPPORT
-
-#if I2C_USE_BRZO
-#include <brzo_i2c.h>
-#else
-#include <Wire.h>
-#endif
-
 void i2c_wakeup(uint8_t address);
 uint8_t i2c_write_buffer(uint8_t address, uint8_t * buffer, size_t len);
 uint8_t i2c_write_uint8(uint8_t address, uint8_t value);
@@ -44,5 +36,3 @@ unsigned char i2cFind(size_t size, unsigned char * addresses, unsigned char &sta
 unsigned char i2cFind(size_t size, unsigned char * addresses);
 
 void i2cSetup();
-
-#endif // I2C_SUPPORT == 1
diff --git a/code/espurna/influxdb.h b/code/espurna/influxdb.h
index 91eca82d..568c9c5c 100644
--- a/code/espurna/influxdb.h
+++ b/code/espurna/influxdb.h
@@ -8,12 +8,7 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #include "espurna.h"
 
-#if INFLUXDB_SUPPORT
-
 bool idbSend(const char * topic, unsigned char id, const char * payload);
 bool idbSend(const char * topic, const char * payload);
 bool idbEnabled();
 void idbSetup();
-
-#endif // INFLUXDB_SUPPORT
-
diff --git a/code/espurna/mdns.h b/code/espurna/mdns.h
index 834afaa8..9e148fc2 100644
--- a/code/espurna/mdns.h
+++ b/code/espurna/mdns.h
@@ -1,11 +1,13 @@
+/*
+
+MDNS MODULE
+
+Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
+
+*/
+
 #pragma once
 
 #include "espurna.h"
-#include <Arduino.h>
-
-#if MDNS_SERVER_SUPPORT
 
-#include <ESP8266mDNS.h>
 void mdnsServerSetup();
-
-#endif
diff --git a/code/espurna/uartmqtt.cpp b/code/espurna/uartmqtt.cpp
index 3219173a..9bdf2dab 100644
--- a/code/espurna/uartmqtt.cpp
+++ b/code/espurna/uartmqtt.cpp
@@ -17,10 +17,13 @@ char _uartmqttBuffer[UART_MQTT_BUFFER_SIZE];
 bool _uartmqttNewData = false;
 
 #if UART_MQTT_USE_SOFT
-    SoftwareSerial _uart_mqtt_serial(UART_MQTT_RX_PIN, UART_MQTT_TX_PIN, false, UART_MQTT_BUFFER_SIZE);
-    #define UART_MQTT_PORT  _uart_mqtt_serial
+#include <SoftwareSerial.h>
+
+SoftwareSerial _uart_mqtt_serial(UART_MQTT_RX_PIN, UART_MQTT_TX_PIN, false, UART_MQTT_BUFFER_SIZE);
+#define UART_MQTT_PORT  _uart_mqtt_serial
 #else
-    #define UART_MQTT_PORT  UART_MQTT_HW_PORT
+#define UART_MQTT_PORT  UART_MQTT_HW_PORT
+
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/code/espurna/uartmqtt.h b/code/espurna/uartmqtt.h
index 0c9574e2..b668a52a 100644
--- a/code/espurna/uartmqtt.h
+++ b/code/espurna/uartmqtt.h
@@ -11,10 +11,4 @@ Adapted by Xose Pérez <xose dot perez at gmail dot com>
 
 #include "espurna.h"
 
-#if UART_MQTT_SUPPORT
-
-#include <SoftwareSerial.h>
-
 void uartmqttSetup();
-
-#endif // UART_MQTT_SUPPORT == 1