7 files changed, 13 insertions, 1 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp.c b/src/compiler/glsl/glcpp/glcpp.c
index 89728ffc67a..f08b14427f4 100644
--- a/src/compiler/glsl/glcpp/glcpp.c
+++ b/src/compiler/glsl/glcpp/glcpp.c
@@ -27,6 +27,7 @@
 #include <getopt.h>
 
 #include "glcpp.h"
+#include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "util/strtod.h"
 
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 3bd07c280d0..1334b35e8c9 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -39,6 +39,8 @@
 #include <GL/glxproto.h>
 
 #include "xm_api.h"
+#include "main/imports.h"
+#include "main/errors.h"
 
 /* An "Atrribs/Attribs" typo was fixed in glxproto.h in Nov 2014.
  * This is in case we don't have the updated header.
diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index 819d2e320d8..9d35054b44d 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -29,9 +29,11 @@
  * Fake implementation of glXUseXFont().
  */
 
-
+#include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 #include <GL/glx.h>
+#include "main/errors.h"
 
 
 /* Some debugging info.  */
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index e8cbb618cea..e4c9408d0db 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -61,12 +61,16 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
+#include "state_tracker/st_api.h"
 
 #include "util/u_atomic.h"
 #include "util/u_inlines.h"
 
 #include "hud/hud_context.h"
 
+#include "main/errors.h"
+#include "main/imports.h"
+
 #include "xm_public.h"
 #include <GL/glx.h>
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.c b/src/gallium/state_trackers/glx/xlib/xm_st.c
index 946b5dcff29..9def70fc746 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_st.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_st.c
@@ -30,6 +30,7 @@
 
 #include "util/u_inlines.h"
 #include "util/u_atomic.h"
+#include "util/u_memory.h"
 
 struct xmesa_st_framebuffer {
    XMesaDisplay display;
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 4d52169d777..97c78145858 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -31,6 +31,7 @@
 
 #include "glxheader.h"
 #include "xmesaP.h"
+#include "main/errors.h"
 #include "main/imports.h"
 #include "main/formats.h"
 #include "main/framebuffer.h"
diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h
index 7a4911cd74a..f5665e6316e 100644
--- a/src/mesa/program/ir_to_mesa.h
+++ b/src/mesa/program/ir_to_mesa.h
@@ -31,6 +31,7 @@ extern "C" {
 #endif
 
 struct gl_context;
+struct gl_program;
 struct gl_shader;
 struct gl_shader_program;
 struct gl_linked_shader;