diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index 7059c7b658..75cadd4a4c 100644
--- a/firmware/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/controllers/algo/engine_configuration_generated_structures.h
@@ -1,7 +1,7 @@
-// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 19:21:18 EDT 2019
+// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 20:05:22 EDT 2019
 // begin
-#ifndef ENGINE_CONFIGURATION_GENERATED_H_
-#define ENGINE_CONFIGURATION_GENERATED_H_
+#ifndef CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
+#define CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
 #include "rusefi_types.h"
 // start of pid_s
 struct pid_s {
@@ -2788,4 +2788,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 19:21:18 EDT 2019
+// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Mon May 27 20:05:22 EDT 2019
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index b0f08df4ae..962d73e640 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml b/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml
index 8638714b55..23175c3bc9 100644
--- a/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml
+++ b/java_tools/configuration_definition/.idea/runConfigurations/ConfigDefinition.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ConfigDefinition" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="com.rusefi.ConfigDefinition" />
     <module name="configuration_definition" />
-    <option name="PROGRAM_PARAMETERS" value="-definition ../../firmware/integration/rusefi_config.txt -ts_destination ../../firmware/tunerstudio -c_destination ../../firmware/controllers\algo -java_destination ../../java_console -skip lastMd5" />
+    <option name="PROGRAM_PARAMETERS" value="-definition ../../firmware/integration/rusefi_config.txt -ts_destination ../../firmware/tunerstudio -c_destination ../../firmware/controllers\algo\engine_configuration_generated_structures.h -java_destination ../../java_console -skip lastMd5" />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
       <option name="TRANSPORT" value="0" />
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index 4b213074c9..9d75205943 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -97,11 +97,8 @@ public class ConfigDefinition {
         ReaderState state = new ReaderState();
 
         List<ConfigurationConsumer> destinations = new ArrayList<>();
-        BufferedWriter cHeader = null;
         if (destCHeader != null) {
-            System.out.println("Writing C header to " + destCHeader);
-            cHeader = new BufferedWriter(new FileWriter(destCHeader));
-            destinations.add(new CHeaderConsumer(cHeader));
+            destinations.add(new CHeaderConsumer(destCHeader));
         }
         if (tsPath != null) {
             CharArrayWriter tsWriter = new CharArrayWriter();
@@ -118,7 +115,6 @@ public class ConfigDefinition {
 
         state.ensureEmptyAfterProcessing();
 
-        cHeader.close();
 
         if (destCDefines != null)
             VariableRegistry.INSTANCE.writeNumericsToFile(destCDefines);
diff --git a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java
index c741cd8fc7..38732c5cca 100644
--- a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java
@@ -5,6 +5,7 @@ import com.rusefi.ConfigField;
 import com.rusefi.ConfigStructure;
 
 import java.io.BufferedWriter;
+import java.io.FileWriter;
 import java.io.IOException;
 
 import static com.rusefi.ConfigDefinition.EOL;
@@ -16,12 +17,14 @@ public class CHeaderConsumer implements ConfigurationConsumer {
     public static final String BOOLEAN_TYPE = "bool";
     private final BufferedWriter cHeader;
 
-    public CHeaderConsumer(BufferedWriter cHeader) throws IOException {
-        this.cHeader = cHeader;
+    public CHeaderConsumer(String destCHeader) throws IOException {
+        System.out.println("Writing C header to " + destCHeader);
+        cHeader = new BufferedWriter(new FileWriter(destCHeader));
         cHeader.write("// this section " + ConfigDefinition.MESSAGE + EOL);
         cHeader.write("// begin" + EOL);
-        cHeader.write("#ifndef ENGINE_CONFIGURATION_GENERATED_H_" + EOL);
-        cHeader.write("#define ENGINE_CONFIGURATION_GENERATED_H_" + EOL);
+        String id = destCHeader.replaceAll("[\\\\\\.\\/]", "_").toUpperCase();
+        cHeader.write("#ifndef " + id + EOL);
+        cHeader.write("#define " + id + EOL);
         cHeader.write("#include \"rusefi_types.h\"" + EOL);
     }
 
@@ -77,5 +80,6 @@ public class CHeaderConsumer implements ConfigurationConsumer {
         cHeader.write("#endif" + EOL);
         cHeader.write("// end" + EOL);
         cHeader.write("// this section " + ConfigDefinition.MESSAGE + EOL);
+        cHeader.close();
     }
 }