--- a/Makefile	Wed Nov 23 12:21:54 2005 +0000
+++ b/Makefile	Wed Nov 23 13:45:12 2005 +0000
@@ -358,7 +358,7 @@
 
 # See if we want to enable GPMI
 ifdef GPMI
-CFLAGS  += -DGPMI
+CFLAGS  += -DGPMI `gpmi-config --include`
 GPMI_STATIC_PATH = `gpmi-config --static`
 LDFLAGS += -rdynamic `gpmi-config --libs`
 # Static link paths into the game

--- a/openttd.c	Wed Nov 23 12:21:54 2005 +0000
+++ b/openttd.c	Wed Nov 23 13:45:12 2005 +0000
@@ -45,7 +45,7 @@
 
 #ifdef GPMI
 #include <gpmi.h>
-#include <gpmi/packages/paths.h>
+#include <gpmi_pkg/paths.h>
 #endif /* GPMI */
 
 void GenerateWorld(int mode, uint size_x, uint size_y);