diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h b/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
index 40bf15d0375..94fe730ce93 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/ggimesa.h
@@ -30,7 +30,10 @@
 #include <stdarg.h>
 #include "config.h"
 #include "context.h"
+#include "drawpix.h"
+#include "mem.h"
 #include "matrix.h"
+#include "state.h"
 #include "types.h"
 #include "macros.h"
 #include "depth.h"