.

wcfs/internal/wcfs_misc.h

@@ -27,6 +27,7 @@
 #include <config.h>
 #undef  HAVE_BUILTIN_TYPES_COMPATIBLE_P
 #define HAVE_BUILTIN_TYPES_COMPATIBLE_P 0
+#include <ccan/array_size/array_size.h>
 
 #include <stddef.h>
 #include <stdint.h>

wcfs/internal/wcfs_virtmem.cpp

@@ -21,8 +21,9 @@
 //
 // XXX provides isolated view.
 
-#include <golang/libgolang.h>
-using namespace golang;
+#include "wcfs_misc.h"
+#include "wcfs.h"
+#include "wcfs_watchlink.h"
 
 #include <wendelin/bigfile/virtmem.h>
 #include <wendelin/bigfile/ram.h>
@@ -38,10 +39,6 @@ using namespace golang;
 #include <unistd.h>
 
 
-#include "wcfs.h"
-#include "wcfs_watchlink.h"
-#include "wcfs_misc.h"
-
 
 using std::min;
 using std::vector;

wcfs/internal/wcfs_watchlink.cpp

@@ -17,6 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
+#include "wcfs_misc.h"
 #include "wcfs.h"
 #include "wcfs_watchlink.h"