diff --git a/include/gdisp.h b/include/gdisp.h
index bf1e7dbe..9e3a3b77 100644
--- a/include/gdisp.h
+++ b/include/gdisp.h
@@ -27,6 +27,10 @@
 #ifndef _GDISP_H
 #define _GDISP_H
 
+#ifndef GFX_USE_GDISP
+	#define GFX_USE_GDISP FALSE
+#endif
+
 #if GFX_USE_GDISP || defined(__DOXYGEN__)
 
 /*===========================================================================*/
diff --git a/include/graph.h b/include/graph.h
index 980ed996..9b4603bd 100644
--- a/include/graph.h
+++ b/include/graph.h
@@ -21,15 +21,19 @@
 #ifndef GRAPH_H
 #define GRAPH_H
 
+#ifndef GFX_USE_GRAPH
+	#define GFX_USE_GRAPH FALSE
+#endif
+
 #if GFX_USE_GRAPH
 
 typedef struct _Graph {
 	coord_t origin_x;
 	coord_t origin_y;
-	int xmin;
-	int xmax;
-	int ymin;
-	int ymax;
+	coord_t xmin;
+	coord_t xmax;
+	coord_t ymin;
+	coord_t ymax;
 	uint16_t grid_size;
 	uint16_t dot_space;
 	bool_t full_grid;