diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index eb1cf680787927e10e4cfe38c54c5e127c6efd60..c49e8d77d41b25b0e9f38ef357663541f9cbbedb 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,8 +41,9 @@ SourceFiles
 #ifndef conformalVoronoiMesh_H
 #define conformalVoronoiMesh_H
 
-#include "CGALTriangulation3Ddefs.H"
+// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
 #include "uint.H"
+#include "CGALTriangulation3Ddefs.H"
 #include "searchableSurfaces.H"
 #include "conformationSurfaces.H"
 #include "cellShapeControl.H"
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
index e3c415b7fabe3997d1b7ecb8d8b7313b2b262916..5c5a69afea8098d8b47f716a64ba8159acf30412 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,8 @@ SourceFiles
 #ifndef featurePointConformer_H
 #define featurePointConformer_H
 
+// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
+#include "uint.H"
 #include "CGALTriangulation3Ddefs.H"
 #include "vector.H"
 #include "DynamicList.H"
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H
index 4948196fc2c685a7ece2aea29b8df50e4b5f20e7..0d9a4d0ebfa8ef147ccac8d6666772ca7fd5444c 100644
--- a/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,8 +117,9 @@ SourceFiles
 #define CGAL_INEXACT
 #define CGAL_HIERARCHY
 
+// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
+#include "uint.H"
 #include "CGALTriangulation2Ddefs.H"
-
 #include "Time.H"
 #include "point2DFieldFwd.H"
 #include "dictionary.H"