diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index 061801e7e60..8e69cfcf67c 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 #include "glsl_symbol_table.h"
+#include "mesa/main/config.h"
 #include "mesa/main/menums.h" /* for gl_api */
 
 /* THIS is a macro defined somewhere deep in the Windows MSVC header files.
diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index 8657e00e8e8..d5c0721f0c7 100644
--- a/src/compiler/glsl_types.h
+++ b/src/compiler/glsl_types.h
@@ -36,10 +36,6 @@
 #include "util/macros.h"
 #include "util/simple_mtx.h"
 
-#ifdef __cplusplus
-#include "mesa/main/config.h"
-#endif
-
 struct glsl_type;
 
 #ifdef __cplusplus
@@ -1066,7 +1062,7 @@ public:
    unsigned atomic_size() const
    {
       if (is_atomic_uint())
-         return ATOMIC_COUNTER_SIZE;
+         return 4; /* ATOMIC_COUNTER_SIZE */
       else if (is_array())
          return length * fields.array->atomic_size();
       else