Updated includes.
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 4f160b1..b824ce2 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -44,7 +44,8 @@
 #include "macros.h"
 #include "mtypes.h"
 #include "nvfragparse.h"
-#include "program_instruction.h"
+#include "prog_parameter.h"
+#include "prog_instruction.h"
 #include "nvvertexec.h"
 #include "nvvertparse.h"
 #include "nvprogram.h"
diff --git a/src/mesa/shader/programopt.c b/src/mesa/shader/programopt.c
index 51caa02..c190071e 100644
--- a/src/mesa/shader/programopt.c
+++ b/src/mesa/shader/programopt.c
@@ -36,8 +36,10 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "program.h"
+#include "prog_parameter.h"
+#include "prog_statevars.h"
 #include "programopt.h"
-#include "program_instruction.h"
+#include "prog_instruction.h"
 
 
 /**
diff --git a/src/mesa/shader/shaderobjects.c b/src/mesa/shader/shaderobjects.c
index 976fa0a..24fab98 100644
--- a/src/mesa/shader/shaderobjects.c
+++ b/src/mesa/shader/shaderobjects.c
@@ -34,6 +34,7 @@
 #include "hash.h"
 #include "macros.h"
 #include "program.h"
+#include "prog_parameter.h"
 #include "shaderobjects.h"
 #include "shaderobjects_3dlabs.h"
 #include "slang_link.h"