-#include <cl_number.h>
-#include <cl_io.h>
-#include <cl_integer.h>
-#include <cl_integer_io.h>
-#include <cl_modinteger.h>
-#include <cl_numtheory.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cl_timing.h>
+#include <cln/number.h>
+#include <cln/io.h>
+#include <cln/integer.h>
+#include <cln/integer_io.h>
+#include <cln/modinteger.h>
+#include <cln/numtheory.h>
+#include <cstdlib>
+#include <cstring>
+#include <cln/timing.h>
+using namespace cln;
+#include <iostream>
+using namespace std;