33 files changed, 99 insertions, 99 deletions

diff --git a/src/cm/cm.h b/src/cm/cm.h
index 58d09fa..b80d987 100644
--- a/src/cm/cm.h
+++ b/src/cm/cm.h
@@ -5,8 +5,8 @@
 /**
  * @file cm.h
  */
-#ifndef ECGEN_CM_H
-#define ECGEN_CM_H
+#ifndef ECGEN_CM_CM_H
+#define ECGEN_CM_CM_H
 
 #include "io/cli.h"
 #include "misc/config.h"
@@ -17,4 +17,4 @@
  */
 int cm_do();
 
-#endif  // ECGEN_CM_H
+#endif  // ECGEN_CM_CM_H
diff --git a/src/cm/p1363.h b/src/cm/p1363.h
index e35b041..d80d70f 100644
--- a/src/cm/p1363.h
+++ b/src/cm/p1363.h
@@ -5,8 +5,8 @@
 /**
  * @file p1363.h
  */
-#ifndef ECGEN_P1363_H
-#define ECGEN_P1363_H
+#ifndef ECGEN_CM_P1363_H
+#define ECGEN_CM_P1363_H
 
 #include <pari/pari.h>
 
@@ -36,4 +36,4 @@ GEN p1363_invariant(GEN D, form_t *form);
 
 GEN p1363_poly(GEN D, form_t **forms, size_t nforms);
 
-#endif  // ECGEN_P1363_H
+#endif  // ECGEN_CM_P1363_H
diff --git a/src/exhaustive/anomalous.h b/src/exhaustive/anomalous.h
index 28178d9..4083655 100644
--- a/src/exhaustive/anomalous.h
+++ b/src/exhaustive/anomalous.h
@@ -5,8 +5,8 @@
 /**
  * @file anomalous.h
  */
-#ifndef ECGEN_ANOMALOUS_H
-#define ECGEN_ANOMALOUS_H
+#ifndef ECGEN_EXHAUSTIVE_ANOMALOUS_H
+#define ECGEN_EXHAUSTIVE_ANOMALOUS_H
 
 #include <pari/pari.h>
 #include "arg.h"
@@ -57,4 +57,4 @@ void anomalous_init();
  */
 void anomalous_quit();
 
-#endif  // ECGEN_ANOMALOUS_H
+#endif  // ECGEN_EXHAUSTIVE_ANOMALOUS_H
diff --git a/src/exhaustive/ansi.h b/src/exhaustive/ansi.h
index 7868dde..8d12491 100644
--- a/src/exhaustive/ansi.h
+++ b/src/exhaustive/ansi.h
@@ -5,8 +5,8 @@
 /*
  * @file ansi.h
  */
-#ifndef ECGEN_ANSI_H
-#define ECGEN_ANSI_H
+#ifndef ECGEN_EXHAUSTIVE_ANSI_H
+#define ECGEN_EXHAUSTIVE_ANSI_H
 
 #include "misc/types.h"
 
@@ -44,4 +44,4 @@ GENERATOR(ansi_gen_seed_input);
  */
 GENERATOR(ansi_gen_equation);
 
-#endif  // ECGEN_ANSI_H
+#endif  // ECGEN_EXHAUSTIVE_ANSI_H
diff --git a/src/exhaustive/arg.h b/src/exhaustive/arg.h
index 26eb171..1c8ae43 100644
--- a/src/exhaustive/arg.h
+++ b/src/exhaustive/arg.h
@@ -5,8 +5,8 @@
 /**
  * @file arg.h
  */
-#ifndef ECGEN_ARG_H
-#define ECGEN_ARG_H
+#ifndef ECGEN_EXHAUSTIVE_ARG_H
+#define ECGEN_EXHAUSTIVE_ARG_H
 
 #include "io/output.h"
 #include "misc/types.h"
@@ -29,4 +29,4 @@ arg_t *arg_new(void);
  */
 void arg_free(arg_t **arg);
 
-#endif  // ECGEN_ARG_H
+#endif  // ECGEN_EXHAUSTIVE_ARG_H
diff --git a/src/exhaustive/brainpool.h b/src/exhaustive/brainpool.h
index 5767aca..4272d87 100644
--- a/src/exhaustive/brainpool.h
+++ b/src/exhaustive/brainpool.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2017-2018 J08nY
  */
 
-#ifndef ECGEN_BRAINPOOL_H
-#define ECGEN_BRAINPOOL_H
+#ifndef ECGEN_EXHAUSTIVE_BRAINPOOL_H
+#define ECGEN_EXHAUSTIVE_BRAINPOOL_H
 
 #include "misc/types.h"
 
@@ -102,4 +102,4 @@ CHECK(brainpool_check_gens);
  */
 CHECK(brainpool_check_order);
 
-#endif  // ECGEN_BRAINPOOL_H
+#endif  // ECGEN_EXHAUSTIVE_BRAINPOOL_H
diff --git a/src/exhaustive/brainpool_rfc.h b/src/exhaustive/brainpool_rfc.h
index fbc5128..c37a777 100644
--- a/src/exhaustive/brainpool_rfc.h
+++ b/src/exhaustive/brainpool_rfc.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2017-2018 J08nY
  */
 
-#ifndef ECGEN_BRAINPOOL_RFC_H
-#define ECGEN_BRAINPOOL_RFC_H
+#ifndef ECGEN_EXHAUSTIVE_BRAINPOOL_RFC_H
+#define ECGEN_EXHAUSTIVE_BRAINPOOL_RFC_H
 
 #include "misc/types.h"
 
@@ -44,4 +44,4 @@ GENERATOR(brainpool_rfc_gen_seed_input);
  */
 GENERATOR(brainpool_rfc_gen_equation);
 
-#endif  // ECGEN_BRAINPOOL_RFC_H
+#endif  // ECGEN_EXHAUSTIVE_BRAINPOOL_RFC_H
diff --git a/src/exhaustive/check.h b/src/exhaustive/check.h
index fc405a3..9aa5a3c 100644
--- a/src/exhaustive/check.h
+++ b/src/exhaustive/check.h
@@ -5,8 +5,8 @@
 /**
  * @file check.h
  */
-#ifndef ECGEN_CHECK_H
-#define ECGEN_CHECK_H
+#ifndef ECGEN_EXHAUSTIVE_CHECK_H
+#define ECGEN_EXHAUSTIVE_CHECK_H
 
 #include "misc/types.h"
 
@@ -22,4 +22,4 @@ check_t *check_new(check_f one, ...);
  */
 void check_free(check_t **check);
 
-#endif  // ECGEN_CHECK_H
+#endif  // ECGEN_EXHAUSTIVE_CHECK_H
diff --git a/src/exhaustive/exhaustive.h b/src/exhaustive/exhaustive.h
index a7da53f..9cd2393 100644
--- a/src/exhaustive/exhaustive.h
+++ b/src/exhaustive/exhaustive.h
@@ -5,8 +5,8 @@
 /**
  * @file exhaustive.h
  */
-#ifndef ECGEN_EXHAUSTIVE_H
-#define ECGEN_EXHAUSTIVE_H
+#ifndef ECGEN_EXHAUSTIVE_EXHAUSTIVE_H
+#define ECGEN_EXHAUSTIVE_EXHAUSTIVE_H
 
 #include "misc/types.h"
 
@@ -61,4 +61,4 @@ int exhaustive_gen(curve_t *curve, const exhaustive_t *setup,
  */
 int exhaustive_do();
 
-#endif  // ECGEN_EXHAUSTIVE_H
+#endif  // ECGEN_EXHAUSTIVE_EXHAUSTIVE_H
diff --git a/src/gen/curve.h b/src/gen/curve.h
index e2316c6..b2158eb 100644
--- a/src/gen/curve.h
+++ b/src/gen/curve.h
@@ -5,8 +5,8 @@
 /**
  * @file curve.h
  */
-#ifndef ECGEN_CURVE_H
-#define ECGEN_CURVE_H
+#ifndef ECGEN_GEN_CURVE_H
+#define ECGEN_GEN_CURVE_H
 
 #include <pari/pari.h>
 #include "misc/types.h"
@@ -96,4 +96,4 @@ curve_t *curve_new_clone(const curve_t *src);
  */
 void curve_free(curve_t **curve);
 
-#endif  // ECGEN_CURVE_H
+#endif  // ECGEN_GEN_CURVE_H
diff --git a/src/gen/equation.h b/src/gen/equation.h
index b344635..2a732d9 100644
--- a/src/gen/equation.h
+++ b/src/gen/equation.h
@@ -5,8 +5,8 @@
 /**
  * @file equation.h
  */
-#ifndef ECGEN_EQUATION_H
-#define ECGEN_EQUATION_H
+#ifndef ECGEN_GEN_EQUATION_H
+#define ECGEN_GEN_EQUATION_H
 
 #include "misc/types.h"
 
@@ -136,4 +136,4 @@ GENERATOR(b_gen_seed);
  */
 void equation_quit(void);
 
-#endif  // ECGEN_EQUATION_H
+#endif  // ECGEN_GEN_EQUATION_H
diff --git a/src/gen/field.h b/src/gen/field.h
index 7a16fe4..6d61453 100644
--- a/src/gen/field.h
+++ b/src/gen/field.h
@@ -5,8 +5,8 @@
 /**
  * @file field.h
  */
-#ifndef ECGEN_FIELD_H
-#define ECGEN_FIELD_H
+#ifndef ECGEN_GEN_FIELD_H
+#define ECGEN_GEN_FIELD_H
 
 #include "misc/types.h"
 
@@ -79,4 +79,4 @@ GEN field_ielement(GEN field, GEN in);
  */
 void field_quit(void);
 
-#endif  // ECGEN_FIELD_H
+#endif  // ECGEN_GEN_FIELD_H
diff --git a/src/gen/gens.h b/src/gen/gens.h
index a1ab63c..c36f862 100644
--- a/src/gen/gens.h
+++ b/src/gen/gens.h
@@ -6,8 +6,8 @@
  * @brief
  * @file gens.h
  */
-#ifndef ECGEN_GENS_H
-#define ECGEN_GENS_H
+#ifndef ECGEN_GEN_GENS_H
+#define ECGEN_GEN_GENS_H
 
 #include "misc/types.h"
 
@@ -82,4 +82,4 @@ CHECK(gens_check_embedding);
  */
 UNROLL(gens_unroll);
 
-#endif  // ECGEN_GENS_H
+#endif  // ECGEN_GEN_GENS_H
diff --git a/src/gen/hex.h b/src/gen/hex.h
index 23621de..b366af7 100644
--- a/src/gen/hex.h
+++ b/src/gen/hex.h
@@ -5,8 +5,8 @@
 /**
  * @file hex.h
  */
-#ifndef ECGEN_HEX_H
-#define ECGEN_HEX_H
+#ifndef ECGEN_GEN_HEX_H
+#define ECGEN_GEN_HEX_H
 
 #include "misc/types.h"
 
@@ -19,4 +19,4 @@
  */
 CHECK(hex_check_param);
 
-#endif  // ECGEN_HEX_H
+#endif  // ECGEN_GEN_HEX_H
diff --git a/src/gen/order.h b/src/gen/order.h
index e77937f..53e2250 100644
--- a/src/gen/order.h
+++ b/src/gen/order.h
@@ -5,8 +5,8 @@
 /**
  * @file order.h
  */
-#ifndef ECGEN_ORDER_H
-#define ECGEN_ORDER_H
+#ifndef ECGEN_GEN_ORDER_H
+#define ECGEN_GEN_ORDER_H
 
 #include "misc/types.h"
 
@@ -85,4 +85,4 @@ CHECK(order_check_pohlig_hellman);
  */
 CHECK(order_check_discriminant);
 
-#endif  // ECGEN_ORDER_H
+#endif  // ECGEN_GEN_ORDER_H
diff --git a/src/gen/point.h b/src/gen/point.h
index c97e738..cc03326 100644
--- a/src/gen/point.h
+++ b/src/gen/point.h
@@ -5,8 +5,8 @@
 /**
  * @file point.h
  */
-#ifndef ECGEN_POINT_H
-#define ECGEN_POINT_H
+#ifndef ECGEN_GEN_POINT_H
+#define ECGEN_GEN_POINT_H
 
 #include "misc/types.h"
 
@@ -182,4 +182,4 @@ GENERATOR(points_gen_nonprime);
  */
 UNROLL(points_unroll);
 
-#endif  // ECGEN_POINT_H
+#endif  // ECGEN_GEN_POINT_H
diff --git a/src/gen/seed.h b/src/gen/seed.h
index 67482e3..89a229e 100644
--- a/src/gen/seed.h
+++ b/src/gen/seed.h
@@ -5,8 +5,8 @@
 /**
  * @file seed.h
  */
-#ifndef ECGEN_SEED_H
-#define ECGEN_SEED_H
+#ifndef ECGEN_GEN_SEED_H
+#define ECGEN_GEN_SEED_H
 
 #include "io/input.h"
 #include "misc/types.h"
@@ -58,4 +58,4 @@ void seed_free(seed_t **seed);
  */
 UNROLL(seed_unroll);
 
-#endif  // ECGEN_SEED_H
+#endif  // ECGEN_GEN_SEED_H
diff --git a/src/invalid/invalid.h b/src/invalid/invalid.h
index b63d3b8..15d6441 100644
--- a/src/invalid/invalid.h
+++ b/src/invalid/invalid.h
@@ -5,8 +5,8 @@
 /**
  * @file invalid.h
  */
-#ifndef ECGEN_INVALID_H
-#define ECGEN_INVALID_H
+#ifndef ECGEN_INVALID_INVALID_H
+#define ECGEN_INVALID_INVALID_H
 
 #include "misc/config.h"
 
@@ -16,4 +16,4 @@
  */
 int invalid_do();
 
-#endif  // ECGEN_INVALID_H
+#endif  // ECGEN_INVALID_INVALID_H
diff --git a/src/invalid/invalid_thread.h b/src/invalid/invalid_thread.h
index 3b1e926..45be0e2 100644
--- a/src/invalid/invalid_thread.h
+++ b/src/invalid/invalid_thread.h
@@ -5,8 +5,8 @@
 /**
  * @file invalid_thread.h
  */
-#ifndef ECGEN_INVALID_THREAD_H
-#define ECGEN_INVALID_THREAD_H
+#ifndef ECGEN_INVALID_INVALID_THREAD_H
+#define ECGEN_INVALID_INVALID_THREAD_H
 
 #include <pthread.h>
 #include "exhaustive/exhaustive.h"
@@ -35,4 +35,4 @@ typedef struct {
  */
 void *invalid_thread(void *arg);
 
-#endif  // ECGEN_INVALID_THREAD_H
+#endif  // ECGEN_INVALID_INVALID_THREAD_H
diff --git a/src/io/cli.h b/src/io/cli.h
index 444163d..f480f7f 100644
--- a/src/io/cli.h
+++ b/src/io/cli.h
@@ -5,8 +5,8 @@
 /**
  * @file cli.h
  */
-#ifndef ECGEN_CLI_H
-#define ECGEN_CLI_H
+#ifndef ECGEN_IO_CLI_H
+#define ECGEN_IO_CLI_H
 
 #include <argp.h>
 #include <stdbool.h>
@@ -34,4 +34,4 @@ error_t cli_parse(int key, char *arg, struct argp_state *state);
  */
 char *cli_filter(int key, const char *text, void *input);
 
-#endif  // ECGEN_CLI_H
+#endif  // ECGEN_IO_CLI_H
diff --git a/src/io/input.h b/src/io/input.h
index ed184c4..a56347a 100644
--- a/src/io/input.h
+++ b/src/io/input.h
@@ -5,8 +5,8 @@
 /**
  * @file input.h
  */
-#ifndef ECGEN_INPUT_H
-#define ECGEN_INPUT_H
+#ifndef ECGEN_IO_INPUT_H
+#define ECGEN_IO_INPUT_H
 
 #include "misc/types.h"
 #include "util/random.h"
@@ -57,4 +57,4 @@ bool input_init();
  */
 void input_quit(void);
 
-#endif  // ECGEN_INPUT_H
+#endif  // ECGEN_IO_INPUT_H
diff --git a/src/io/output.h b/src/io/output.h
index 6c048d9..1bf9aee 100644
--- a/src/io/output.h
+++ b/src/io/output.h
@@ -5,8 +5,8 @@
 /**
  * @file output.h
  */
-#ifndef ECGEN_OUTPUT_H
-#define ECGEN_OUTPUT_H
+#ifndef ECGEN_IO_OUTPUT_H
+#define ECGEN_IO_OUTPUT_H
 
 #include <pari/pari.h>
 #include <stdbool.h>
@@ -202,4 +202,4 @@ bool output_init();
  */
 void output_quit(void);
 
-#endif  // ECGEN_OUTPUT_H
+#endif  // ECGEN_IO_OUTPUT_H
diff --git a/src/math/koblitz.h b/src/math/koblitz.h
index f1b87d2..8122c44 100644
--- a/src/math/koblitz.h
+++ b/src/math/koblitz.h
@@ -2,8 +2,8 @@
  * ecgen, tool for generating Elliptic curve domain parameters
  * Copyright (C) 2017-2018 J08nY
  */
-#ifndef ECGEN_KOBLITZ_H
-#define ECGEN_KOBLITZ_H
+#ifndef ECGEN_MATH_KOBLITZ_H
+#define ECGEN_MATH_KOBLITZ_H
 
 #include <stdbool.h>
 #include "misc/types.h"
@@ -37,4 +37,4 @@ const koblitz_t *koblitz_find(unsigned int m, unsigned int a);
  */
 GEN koblitz_get_order(unsigned int m, unsigned int a);
 
-#endif  // ECGEN_KOBLITZ_H
+#endif  // ECGEN_MATH_KOBLITZ_H
diff --git a/src/math/poly.h b/src/math/poly.h
index 6c298d8..7fd36fd 100644
--- a/src/math/poly.h
+++ b/src/math/poly.h
@@ -5,8 +5,8 @@
 /**
  * @file poly.h
  */
-#ifndef ECGEN_POLY_H
-#define ECGEN_POLY_H
+#ifndef ECGEN_MATH_POLY_H
+#define ECGEN_MATH_POLY_H
 
 #include <pari/pari.h>
 #include <stdbool.h>
@@ -55,4 +55,4 @@ GEN poly_gen(const polynomial_t *polynomial);
  */
 GEN poly_find_gen(unsigned long m);
 
-#endif  // ECGEN_POLY_H
+#endif  // ECGEN_MATH_POLY_H
diff --git a/src/math/subgroup.h b/src/math/subgroup.h
index ad36826..94df006 100644
--- a/src/math/subgroup.h
+++ b/src/math/subgroup.h
@@ -5,8 +5,8 @@
 /**
  * @file subgroup.h
  */
-#ifndef ECGEN_SUBGROUPS_H
-#define ECGEN_SUBGROUPS_H
+#ifndef ECGEN_MATH_SUBGROUPS_H
+#define ECGEN_MATH_SUBGROUPS_H
 
 #include <pari/pari.h>
 #include "misc/types.h"
@@ -136,4 +136,4 @@ GEN subgroups_nonprime(GEN order);
  */
 GEN subgroups_all(GEN order);
 
-#endif  // ECGEN_SUBGROUPS_H
+#endif  // ECGEN_MATH_SUBGROUPS_H
diff --git a/src/math/twists.h b/src/math/twists.h
index d68bb27..b463560 100644
--- a/src/math/twists.h
+++ b/src/math/twists.h
@@ -2,8 +2,8 @@
  * ecgen, tool for generating Elliptic curve domain parameters
  * Copyright (C) 2017-2018 J08nY
  */
-#ifndef ECGEN_TWIST_H
-#define ECGEN_TWIST_H
+#ifndef ECGEN_MATH_TWIST_H
+#define ECGEN_MATH_TWIST_H
 
 #include "misc/types.h"
 
@@ -20,4 +20,4 @@ void twist_rand_to(curve_t *to, const curve_t *of);
  */
 void twist_rand(curve_t *what);
 
-#endif  // ECGEN_TWIST_H
+#endif  // ECGEN_MATH_TWIST_H
diff --git a/src/misc/config.h b/src/misc/config.h
index ab5b0ba..2800783 100644
--- a/src/misc/config.h
+++ b/src/misc/config.h
@@ -5,8 +5,8 @@
 /**
  * @file config.h
  */
-#ifndef ECGEN_CONFIG_H
-#define ECGEN_CONFIG_H
+#ifndef ECGEN_MISC_CONFIG_H
+#define ECGEN_MISC_CONFIG_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -125,4 +125,4 @@ typedef struct {
 extern config_t cfg_s;
 extern config_t *cfg;
 
-#endif  // ECGEN_CONFIG_H
+#endif  // ECGEN_MISC_CONFIG_H
diff --git a/src/misc/types.h b/src/misc/types.h
index 0471fc9..4b6d8f9 100644
--- a/src/misc/types.h
+++ b/src/misc/types.h
@@ -5,8 +5,8 @@
 /**
  * @file types.h
  */
-#ifndef ECGEN_TYPES_H
-#define ECGEN_TYPES_H
+#ifndef ECGEN_MISC_TYPES_H
+#define ECGEN_MISC_TYPES_H
 
 #include <limits.h>
 #include <pari/pari.h>
@@ -196,4 +196,4 @@ CHECK(check_skip);
  */
 UNROLL(unroll_skip);
 
-#endif  // ECGEN_TYPES_H
+#endif  // ECGEN_MISC_TYPES_H
diff --git a/src/util/bits.h b/src/util/bits.h
index 4b33e33..20668f7 100644
--- a/src/util/bits.h
+++ b/src/util/bits.h
@@ -5,8 +5,8 @@
 /**
  * @file bits.h
  */
-#ifndef ECGEN_BITS_H
-#define ECGEN_BITS_H
+#ifndef ECGEN_UTIL_BITS_H
+#define ECGEN_UTIL_BITS_H
 
 #include "misc/types.h"
 
@@ -101,4 +101,4 @@ void bits_sha1(const bits_t *bits, unsigned char hashout[20]);
 
 bool bits_eq(const bits_t *one, const bits_t *other);
 
-#endif  // ECGEN_BITS_H
+#endif  // ECGEN_UTIL_BITS_H
diff --git a/src/util/memory.h b/src/util/memory.h
index 3355b8b..55d77cb 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -5,8 +5,8 @@
 /**
  * @file memory.h
  */
-#ifndef ECGEN_MEMORY_H
-#define ECGEN_MEMORY_H
+#ifndef ECGEN_UTIL_MEMORY_H
+#define ECGEN_UTIL_MEMORY_H
 
 #include <stddef.h>
 
@@ -64,4 +64,4 @@ void set_mem_funcs(void *(*malloc_fun)(size_t), void *(*calloc_fun)(size_t),
                    void *(*realloc_fun)(void *, size_t),
                    void (*free_fun)(void *));
 
-#endif  // ECGEN_MEMORY_H
+#endif  // ECGEN_UTIL_MEMORY_H
diff --git a/src/util/random.h b/src/util/random.h
index f5844da..21d32de 100644
--- a/src/util/random.h
+++ b/src/util/random.h
@@ -5,8 +5,8 @@
 /**
  * @file random.h
  */
-#ifndef ECGEN_RANDOM_H
-#define ECGEN_RANDOM_H
+#ifndef ECGEN_UTIL_RANDOM_H
+#define ECGEN_UTIL_RANDOM_H
 
 #include <pari/pari.h>
 #include <stdbool.h>
@@ -51,4 +51,4 @@ GEN random_int(unsigned long bits);
  */
 GEN random_field_element(GEN field);
 
-#endif  // ECGEN_RANDOM_H
+#endif  // ECGEN_UTIL_RANDOM_H
diff --git a/src/util/str.h b/src/util/str.h
index fb828da..2e2feba 100644
--- a/src/util/str.h
+++ b/src/util/str.h
@@ -5,8 +5,8 @@
 /**
  * @file str.h
  */
-#ifndef ECGEN_STR_H
-#define ECGEN_STR_H
+#ifndef ECGEN_UTIL_STR_H
+#define ECGEN_UTIL_STR_H
 
 #include <stddef.h>
 
@@ -42,4 +42,4 @@ char *str_joinv(char *separator, ...);
  */
 char *str_concat(char **strings, size_t len);
 
-#endif  // ECGEN_STR_H
+#endif  // ECGEN_UTIL_STR_H
diff --git a/src/util/timeout.h b/src/util/timeout.h
index 8f545dd..5a5c0d2 100644
--- a/src/util/timeout.h
+++ b/src/util/timeout.h
@@ -5,8 +5,8 @@
 /**
  * @file timeout.h
  */
-#ifndef ECGEN_TIMEOUT_H
-#define ECGEN_TIMEOUT_H
+#ifndef ECGEN_UTIL_TIMEOUT_H
+#define ECGEN_UTIL_TIMEOUT_H
 
 #include <setjmp.h>
 #include <sys/syscall.h>
@@ -72,4 +72,4 @@ bool timeout_init();
  */
 void timeout_quit();
 
-#endif  // ECGEN_TIMEOUT_H
+#endif  // ECGEN_UTIL_TIMEOUT_H