diff --git a/.hgignore b/.hgignore
index 38d64f0a..e43bf1b3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -31,3 +31,6 @@ ltmain.sh
 missing
 m4/libtool.m4
 m4/lt*.m4
+
+# Specific executables
+grid_io_demo
diff --git a/Makefile.am b/Makefile.am
index 7baedf3d..b10d00ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ facetopology.c					\
 facetopology.h					\
 geometry.c					\
 geometry.h					\
+grid.h						\
 preprocess.c					\
 readvector.cpp					\
 readvector.hpp					\
diff --git a/cgridinterface.c b/cgridinterface.c
index b4b1867c..8405ef5b 100644
--- a/cgridinterface.c
+++ b/cgridinterface.c
@@ -1,8 +1,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <grid.h>
-
 #include "geometry.h"
 #include "cgridinterface.h"
 
@@ -69,9 +67,8 @@ static int
 fill_cell_topology(struct processed_grid  *pg,
                    struct CornerpointGrid *G )
 {
-    int    f, c1, c2;
+    int    f, c1, c2, tag;
     size_t c, nc, nhf;
-    enum face_tag tag;
 
     struct UnstructuredGrid *g;
 
@@ -137,6 +134,8 @@ fill_cell_topology(struct processed_grid  *pg,
             }
         }
     }
+
+    return g->cell_facepos != NULL;
 }
 
 void preprocess         (const struct grdecl   *in,
diff --git a/cgridinterface.h b/cgridinterface.h
index 9c8d2665..071a3e38 100644
--- a/cgridinterface.h
+++ b/cgridinterface.h
@@ -19,8 +19,7 @@
 #ifndef CGRIDINTERFACE_H
 #define CGRIDINTERFACE_H
 
-#include <grid.h>
-
+#include "grid.h"
 #include "preprocess.h"
 
 #ifdef __cplusplus