#include "libhashkit/hashkitcon.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
+#include <ciso646>
#ifndef __WORDSIZE
# ifdef __MINGW32__
# endif
#endif
-#include "libhashkit-1.0/hashkit.h"
+#include "libhashkit-1/hashkit.h"
#include "libhashkit/algorithm.h"
#include "libhashkit/is.h"
#include "libhashkit/string.h"