diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c
index 0d07be964..804da3f0a 100644
--- a/src/bank-lib/bank_api_admin.c
+++ b/src/bank-lib/bank_api_admin.c
@@ -24,7 +24,7 @@
 #include <microhttpd.h> /* just for HTTP status codes */
 #include "taler_signatures.h"
 // FIXME(dold): temporary hack
-#include "../lib/teah_common.h"
+#include "teah_common.h"
 
 
 /**
diff --git a/src/exchange/taler-exchange-httpd_parsing.c b/src/exchange/taler-exchange-httpd_parsing.c
index 2a9f7a5a7..d1a1e9df5 100644
--- a/src/exchange/taler-exchange-httpd_parsing.c
+++ b/src/exchange/taler-exchange-httpd_parsing.c
@@ -77,18 +77,20 @@ TEH_PARSE_post_json (struct MHD_Connection *connection,
                                 json);
   switch (pr)
   {
+
   case GNUNET_JSON_PR_OUT_OF_MEMORY:
-    return (MHD_NO ==
-            TEH_RESPONSE_reply_internal_error (connection,
-					       TALER_EC_PARSER_OUT_OF_MEMORY,
-                                               "out of memory"))
-      ? GNUNET_SYSERR : GNUNET_NO;
+    return (MHD_NO == TEH_RESPONSE_reply_internal_error
+      (connection,
+       TALER_EC_PARSER_OUT_OF_MEMORY,
+       "out of memory")) ? GNUNET_SYSERR : GNUNET_NO;
+
   case GNUNET_JSON_PR_CONTINUE:
     return GNUNET_YES;
+
   case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
-    return (MHD_NO ==
-            TEH_RESPONSE_reply_request_too_large (connection))
-      ? GNUNET_SYSERR : GNUNET_NO;
+    return (MHD_NO == TEH_RESPONSE_reply_request_too_large
+      (connection)) ? GNUNET_SYSERR : GNUNET_NO;
+
   case GNUNET_JSON_PR_JSON_INVALID:
     return (MHD_YES ==
             TEH_RESPONSE_reply_invalid_json (connection))
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index d06d0064a..2d5724de6 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -30,7 +30,8 @@ talerinclude_HEADERS = \
   taler_signatures.h \
   taler_wire_lib.h \
   taler_wire_plugin.h \
-  taler_testing_bank_lib.h
+  taler_testing_bank_lib.h \
+  teah_common.h
 
 endif
 
diff --git a/src/lib/teah_common.h b/src/include/teah_common.h
similarity index 100%
rename from src/lib/teah_common.h
rename to src/include/teah_common.h