 +  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 +*/
 +
-+#ifndef CONFIG_MENDER_H
-+#define CONFIG_MENDER_H
++#ifndef HEADER_CONFIG_MENDER_H
++#define HEADER_CONFIG_MENDER_H
 +
 +#include <config_mender_defines.h>
 +

+    "then reset; "                                                      \
+    "fi\0"
+
+#endif /* ENV_MENDER_H */
-- 
2.7.4


+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef HEADER_ENV_MENDER_H
+#define HEADER_ENV_MENDER_H
+
+#include <config_mender_defines.h>
+
