Merge remote-tracking branch 'git.irl/master'

Conflicts:
	wscript
diff --git a/src/db-helper.h b/src/db-helper.h
index a0a9442..51970dd 100644
--- a/src/db-helper.h
+++ b/src/db-helper.h
@@ -22,6 +22,7 @@
 #ifndef DB_HELPER_H
 #define DB_HELPER_H
 
+#include <stdint.h>
 #include <sqlite3.h>
 #include <openssl/evp.h>
 #include <boost/exception/all.hpp>