diff --git a/manual.md b/manual.md
index 76df6557..2ff51a2f 100644
--- a/manual.md
+++ b/manual.md
@@ -65,6 +65,7 @@
+ [7.9. When I build with Visual C++ with /w4 warning level, I have warnings...](#section7_9)
+ [7.10. Why some GLM functions can crash because of division by zero?](#section7_10)
+ [7.11. What unit for angles us used in GLM?](#section7_11)
++ [7.12. Windows headers cause build errors...](#section7_12)
+ [8. Code samples](#section8)
+ [8.1. Compute a triangle normal](#section8_1)
+ [8.2. Matrix transform](#section8_2)
@@ -1135,6 +1136,12 @@ GLM functions crashing is the result of a domain error. Such behavior follows th
GLSL is using radians but GLU is using degrees to express angles. This has caused GLM to use inconsistent units for angles. Starting with GLM 0.9.6, all GLM functions are using radians. For more information, follow
the [link](http://www.g-truc.net/post-0693.html#menu).
+### 7.12. Windows headers cause build errors...
+
+Some Windows headers define min and max as macros which may cause compatibility with third party libraries such as GLM.
+It is highly recommanded to [define NOMINMAX](http://stackoverflow.com/questions/4913922/possible-problems-with-nominmax-on-visual-c) before including Windows headers to workaround this issue.
+To workaround the incompatibility with these macros, GLM will systematically undef these macros if they are defined.
+
---
## 8. Code samples
diff --git a/readme.md b/readme.md
index de2b37e6..39b90aba 100644
--- a/readme.md
+++ b/readme.md
@@ -63,6 +63,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Added lowp variant of GTC_colorspace convertLinearToSRGB #419
- Replaced the manual by a markdown version #458
- Optimized GTC_packing implementation
+- Added FAQ 12: Windows headers cause build errors... #557
#### Fixes:
- Removed doxygen references to GTC_half_float which was removed in 0.9.4
@@ -82,8 +83,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577
---
-#### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12
-##### Improvements:
+### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12
+#### Improvements:
- Broader support of GLM_FORCE_UNRESTRICTED_GENTYPE #378
#### Fixes: