force include of taler_util.h, not of taler_crypto_lib.h or taler_amount_lib.h

6 files changed, 15 insertions, 2 deletions

diff --git a/src/include/taler_amount_lib.h b/src/include/taler_amount_lib.h
index a529cfb84..04aa00045 100644
--- a/src/include/taler_amount_lib.h
+++ b/src/include/taler_amount_lib.h
@@ -18,6 +18,10 @@
  * @brief amount-representation utility functions
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
+#if ! defined (__TALER_UTIL_LIB_H_INSIDE__)
+#error "Only <taler_util.h> can be included directly."
+#endif
+
 #ifndef TALER_AMOUNT_LIB_H
 #define TALER_AMOUNT_LIB_H
 
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index cf27668b6..99b5e7f3f 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -25,6 +25,7 @@
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_db_lib.h>
+#include "taler_util.h"
 #include "taler_auditordb_lib.h"
 #include "taler_signatures.h"
 
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 631883f41..4fdda39e0 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -19,6 +19,10 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff <christian@grothoff.org>
  */
+#if ! defined (__TALER_UTIL_LIB_H_INSIDE__)
+#error "Only <taler_util.h> can be included directly."
+#endif
+
 #ifndef TALER_CRYPTO_LIB_H
 #define TALER_CRYPTO_LIB_H
 
diff --git a/src/include/taler_extensions.h b/src/include/taler_extensions.h
index a37a7461a..fedc17d90 100644
--- a/src/include/taler_extensions.h
+++ b/src/include/taler_extensions.h
@@ -22,7 +22,7 @@
 #define TALER_EXTENSIONS_H
 
 #include <gnunet/gnunet_util_lib.h>
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler_extensions_policy.h"
diff --git a/src/include/taler_extensions_policy.h b/src/include/taler_extensions_policy.h
index 1072e214b..ecb4e2628 100644
--- a/src/include/taler_extensions_policy.h
+++ b/src/include/taler_extensions_policy.h
@@ -22,7 +22,7 @@
 #define TALER_EXTENSIONS_POLICY_H
 
 #include <gnunet/gnunet_util_lib.h>
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 1580f3dca..5776d62c3 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -21,6 +21,8 @@
 #ifndef TALER_UTIL_H
 #define TALER_UTIL_H
 
+#define __TALER_UTIL_LIB_H_INSIDE__
+
 #include <gnunet/gnunet_util_lib.h>
 #include <microhttpd.h>
 #include "taler_amount_lib.h"
@@ -551,4 +553,6 @@ enum GNUNET_GenericReturnValue
 TALER_JSON_parse_age_groups (const json_t *root,
                              struct TALER_AgeMask *mask);
 
+#undef __TALER_UTIL_LIB_H_INSIDE__
+
 #endif