diff --git a/Makefile b/Makefile
index 529477e82a..c513f30913 100644
--- a/Makefile
+++ b/Makefile
@@ -358,7 +358,7 @@ CFLAGS += $(BASECFLAGS)
 
 # 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
diff --git a/openttd.c b/openttd.c
index caff336bdc..c219fb3cc0 100644
--- a/openttd.c
+++ b/openttd.c
@@ -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);