diff --git a/src/nvimage/BlockDXT.cpp b/src/nvimage/BlockDXT.cpp
index 8066f78..5fc301e 100644
--- a/src/nvimage/BlockDXT.cpp
+++ b/src/nvimage/BlockDXT.cpp
@@ -21,11 +21,13 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
+#include "BlockDXT.h"
+
+#include <nvimage/ColorBlock.h>
+
 #include <nvcore/Stream.h>
 #include <nvcore/Containers.h> // swap
 
-#include "ColorBlock.h"
-#include "BlockDXT.h"
 
 using namespace nv;
 
diff --git a/src/nvimage/DirectDrawSurface.cpp b/src/nvimage/DirectDrawSurface.cpp
index 9c14565..f7667e6 100644
--- a/src/nvimage/DirectDrawSurface.cpp
+++ b/src/nvimage/DirectDrawSurface.cpp
@@ -21,16 +21,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Debug.h>
-#include <nvcore/Containers.h> // max
-#include <nvcore/StdStream.h>
-
 #include <nvimage/DirectDrawSurface.h>
 #include <nvimage/ColorBlock.h>
 #include <nvimage/Image.h>
 #include <nvimage/BlockDXT.h>
 #include <nvimage/PixelFormat.h>
 
+#include <nvcore/Debug.h>
+#include <nvcore/Containers.h> // max
+#include <nvcore/StdStream.h>
+
 #include <string.h> // memset
 
 
diff --git a/src/nvimage/Filter.cpp b/src/nvimage/Filter.cpp
index f72388a..ba56506 100644
--- a/src/nvimage/Filter.cpp
+++ b/src/nvimage/Filter.cpp
@@ -33,11 +33,10 @@
  * http://www.dspguide.com/ch16.htm
  */
 
+#include "Filter.h"
 
-#include <nvcore/Containers.h>	// swap
-#include <nvmath/nvmath.h>	// fabs
 #include <nvmath/Vector.h>	// Vector4
-#include <nvimage/Filter.h>
+#include <nvcore/Containers.h>	// swap
 
 using namespace nv;
 
diff --git a/src/nvimage/FloatImage.cpp b/src/nvimage/FloatImage.cpp
index c6d3cbb..40ac8b2 100644
--- a/src/nvimage/FloatImage.cpp
+++ b/src/nvimage/FloatImage.cpp
@@ -1,15 +1,15 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
-#include <nvcore/Containers.h>
-#include <nvcore/Ptr.h>
-
-#include <nvmath/Color.h>
-#include <nvmath/Matrix.h>
-
 #include "FloatImage.h"
 #include "Filter.h"
 #include "Image.h"
 
+#include <nvmath/Color.h>
+#include <nvmath/Matrix.h>
+
+#include <nvcore/Containers.h>
+#include <nvcore/Ptr.h>
+
 #include <math.h>
 
 using namespace nv;
diff --git a/src/nvimage/HoleFilling.cpp b/src/nvimage/HoleFilling.cpp
index 6ea57cb..89af845 100644
--- a/src/nvimage/HoleFilling.cpp
+++ b/src/nvimage/HoleFilling.cpp
@@ -1,12 +1,13 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
+#include <nvimage/HoleFilling.h>
+#include <nvimage/FloatImage.h>
+
+#include <nvmath/nvmath.h>
+
 #include <nvcore/Containers.h>
 #include <nvcore/Ptr.h>
 
-#include <nvmath/nvmath.h>
-
-#include <nvimage/HoleFilling.h>
-#include <nvimage/FloatImage.h>
 
 using namespace nv;
 
diff --git a/src/nvimage/Image.cpp b/src/nvimage/Image.cpp
index d96b0d9..6830992 100644
--- a/src/nvimage/Image.cpp
+++ b/src/nvimage/Image.cpp
@@ -1,14 +1,14 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
+#include <nvimage/Image.h>
+#include <nvimage/ImageIO.h>
+
+#include <nvmath/Color.h>
+
 #include <nvcore/Debug.h>
 #include <nvcore/Ptr.h>
 #include <nvcore/Containers.h> // swap
 
-#include <nvmath/Color.h>
-
-#include <nvimage/Image.h>
-#include <nvimage/ImageIO.h>
-
 
 using namespace nv;
 
diff --git a/src/nvimage/ImageIO.cpp b/src/nvimage/ImageIO.cpp
index 157eff2..87a33f9 100644
--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
@@ -1,5 +1,13 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
+#include "ImageIO.h"
+#include "Image.h"
+#include "FloatImage.h"
+#include "TgaFile.h"
+#include "PsdFile.h"
+
+#include <nvmath/Color.h>
+
 #include <nvcore/Ptr.h>
 #include <nvcore/Containers.h>
 #include <nvcore/StrLib.h>
@@ -7,14 +15,6 @@
 //#include <nvcore/Tokenizer.h>	// @@ Disable temporarily
 #include <nvcore/TextWriter.h>
 
-#include <nvmath/Color.h>
-
-#include "ImageIO.h"
-#include "Image.h"
-#include "FloatImage.h"
-#include "TgaFile.h"
-#include "PsdFile.h"
-
 // Extern
 #if defined(HAVE_JPEG)
 extern "C" {
diff --git a/src/nvimage/NormalMap.cpp b/src/nvimage/NormalMap.cpp
index 841c5ae..2ece574 100644
--- a/src/nvimage/NormalMap.cpp
+++ b/src/nvimage/NormalMap.cpp
@@ -21,15 +21,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Ptr.h>
-
-#include <nvmath/Color.h>
-
 #include <nvimage/NormalMap.h>
 #include <nvimage/Filter.h>
 #include <nvimage/FloatImage.h>
 #include <nvimage/Image.h>
 
+#include <nvmath/Color.h>
+
+#include <nvcore/Ptr.h>
+
+
 using namespace nv;
 
 // Create normal map using the given kernels.
diff --git a/src/nvimage/NormalMipmap.cpp b/src/nvimage/NormalMipmap.cpp
index 253c6d4..63ea49e 100644
--- a/src/nvimage/NormalMipmap.cpp
+++ b/src/nvimage/NormalMipmap.cpp
@@ -1,12 +1,13 @@
 // This code is in the public domain -- castanyo@yahoo.es
 
-#include <nvcore/Ptr.h>
+#include <nvimage/NormalMipmap.h>
+#include <nvimage/FloatImage.h>
 
 #include <nvmath/Montecarlo.h>
 #include <nvmath/SphericalHarmonic.h>
 
-#include <nvimage/NormalMipmap.h>
-#include <nvimage/FloatImage.h>
+#include <nvcore/Ptr.h>
+
 
 using namespace nv;
 
diff --git a/src/nvimage/PsdFile.h b/src/nvimage/PsdFile.h
index 8b2fc18..41379ed 100644
--- a/src/nvimage/PsdFile.h
+++ b/src/nvimage/PsdFile.h
@@ -39,7 +39,7 @@ namespace nv
 		bool isSupported() const
 		{
 			if (version != 1) {
-				printf("*** bad version number %u\n", version);
+				nvDebug("*** bad version number %u\n", version);
 				return false;
 			}
 			if (channel_count > 4) {
diff --git a/src/nvimage/Quantize.cpp b/src/nvimage/Quantize.cpp
index 0f0b075..b67f132 100644
--- a/src/nvimage/Quantize.cpp
+++ b/src/nvimage/Quantize.cpp
@@ -12,14 +12,14 @@ http://www.efg2.com/Lab/Library/ImageProcessing/DHALF.TXT
 @@ This code needs to be reviewed, I'm not sure it's correct.
 */
 
-#include <string.h> // memset
-
-#include <nvcore/Containers.h> // swap
+#include <nvimage/Quantize.h>
+#include <nvimage/Image.h>
 
 #include <nvmath/Color.h>
 
-#include <nvimage/Image.h>
-#include <nvimage/Quantize.h>
+#include <nvcore/Containers.h> // swap
+
+#include <string.h> // memset
 
 using namespace nv;