diff --git a/inst/cta/src/GCTAResponse.cpp b/inst/cta/src/GCTAResponse.cpp
index 6b11fba..9e9581c 100644
--- a/inst/cta/src/GCTAResponse.cpp
+++ b/inst/cta/src/GCTAResponse.cpp
@@ -23,7 +23,8 @@
 #include <vector>
 #include <string>
 #include <unistd.h>           // access() function
-#include <stdio.h>            // fopen, fgets, fclose, etc...
+//#include <stdio.h>            // fopen, fgets, fclose, etc...
+#include <cstdio>             // fopen, fgets, fclose, etc...
 #include "GModelSpatialPtsrc.hpp"
 #include "GTools.hpp"
 #include "GIntegral.hpp"
diff --git a/inst/lat/src/GLATEventList.cpp b/inst/lat/src/GLATEventList.cpp
index a5d5996..3972b6f 100644
--- a/inst/lat/src/GLATEventList.cpp
+++ b/inst/lat/src/GLATEventList.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *                GLATEventList.cpp  -  LAT event list class               *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2010 by Jurgen Knodlseder                           *
+ *  copyright (C) 2009-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,7 +20,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stdio.h>            // sprintf, etc...
+//#include <stdio.h>            // sprintf, etc...
+#include <cstdio>             // sprintf, etc...
 #include "GLATEventList.hpp"
 #include "GException.hpp"
 #include "GTools.hpp"
diff --git a/src/app/GLog.cpp b/src/app/GLog.cpp
index 0faefe1..9b53313 100644
--- a/src/app/GLog.cpp
+++ b/src/app/GLog.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *                       GLog.cpp - Information logger                     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010 by Jurgen Knodlseder                                *
+ *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,13 +20,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <time.h>
+#include <stdarg.h>     // for "va_list" type
+//#include <stdio.h>      // fopen, fgets, fclose, etc...
+//#include <string.h>     // memcpy
 #include <string>
 #include <iostream>
 #include <sstream>
-#include <time.h>
-#include <stdio.h>      // fopen, fgets, fclose, etc...
-#include <string.h>     // memcpy
-#include <stdarg.h>     // for "va_list" type
+#include <cstdio>       // fopen, fgets, fclose, etc...
+#include <cstring>      // memcpy
 #include "GLog.hpp"
 #include "GTools.hpp"
 
diff --git a/src/fits/GFitsTableStringCol.cpp b/src/fits/GFitsTableStringCol.cpp
index e785162..ab1422e 100644
--- a/src/fits/GFitsTableStringCol.cpp
+++ b/src/fits/GFitsTableStringCol.cpp
@@ -15,8 +15,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <string.h>           // strncpy, etc...
 #include <string>
-#include <string.h>           // strncpy, etc...
+#include <cstring>            // strncpy, etc...
 #include "GException.hpp"
 #include "GTools.hpp"
 #include "GFitsCfitsio.hpp"
diff --git a/src/support/GCsv.cpp b/src/support/GCsv.cpp
index f9e1214..bd1b110 100644
--- a/src/support/GCsv.cpp
+++ b/src/support/GCsv.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *             GCsv.cpp - Column separated values table class              *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010 by Jurgen Knodlseder                                *
+ *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,7 +20,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stdio.h>            // fopen, fgets, fclose, etc...
+//#include <stdio.h>            // fopen, fgets, fclose, etc...
+#include <cstdio>            // fopen, fgets, fclose, etc...
 #include "GCsv.hpp"
 #include "GTools.hpp"
 #include "GException.hpp"
diff --git a/src/xml/GXmlAttribute.cpp b/src/xml/GXmlAttribute.cpp
index dae79fb..7f1ef16 100644
--- a/src/xml/GXmlAttribute.cpp
+++ b/src/xml/GXmlAttribute.cpp
@@ -20,8 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fprintf, etc...
 #include <iostream>
-#include <stdio.h>            // fprintf, etc...
+#include <cstdio>             // fprintf, etc...
 #include "GException.hpp"
 #include "GXmlAttribute.hpp"
 
diff --git a/src/xml/GXmlComment.cpp b/src/xml/GXmlComment.cpp
index 9c8922b..a831bf5 100644
--- a/src/xml/GXmlComment.cpp
+++ b/src/xml/GXmlComment.cpp
@@ -20,8 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fopen, fgets, fclose, etc...
 #include <iostream>
-#include <stdio.h>            // fopen, fgets, fclose, etc...
+#include <cstdio>             // fopen, fgets, fclose, etc...
 #include "GException.hpp"
 #include "GXmlComment.hpp"
 
diff --git a/src/xml/GXmlDocument.cpp b/src/xml/GXmlDocument.cpp
index 5f3a98b..5377291 100644
--- a/src/xml/GXmlDocument.cpp
+++ b/src/xml/GXmlDocument.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *        GXmlDocument.cpp - XML document node class implementation        *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2010 by Jurgen Knodlseder                                *
+ *  copyright (C) 2010-2011 by Jurgen Knodlseder                           *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fprintf, etc...
 #include <iostream>
-#include <stdio.h>            // fprintf, etc...
+#include <cstdio>             // fprintf, etc...
 #include "GXmlDocument.hpp"
 
 /* __ Method name definitions ____________________________________________ */
diff --git a/src/xml/GXmlElement.cpp b/src/xml/GXmlElement.cpp
index 28ea964..587098c 100644
--- a/src/xml/GXmlElement.cpp
+++ b/src/xml/GXmlElement.cpp
@@ -20,9 +20,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fopen, fgets, fclose, etc...
 #include <string>
 #include <iostream>
-#include <stdio.h>            // fopen, fgets, fclose, etc...
+#include <cstdio>             // fopen, fgets, fclose, etc...
 #include "GException.hpp"
 #include "GXmlElement.hpp"
 
diff --git a/src/xml/GXmlPI.cpp b/src/xml/GXmlPI.cpp
index fbeb8a1..985483e 100644
--- a/src/xml/GXmlPI.cpp
+++ b/src/xml/GXmlPI.cpp
@@ -20,8 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fprintf, etc...
 #include <iostream>
-#include <stdio.h>            // fprintf, etc...
+#include <cstdio>           // fprintf, etc...
 #include "GException.hpp"
 #include "GXmlPI.hpp"
 
diff --git a/src/xml/GXmlText.cpp b/src/xml/GXmlText.cpp
index eb00f21..dffe1ff 100644
--- a/src/xml/GXmlText.cpp
+++ b/src/xml/GXmlText.cpp
@@ -20,8 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+//#include <stdio.h>            // fprintf, etc...
 #include <iostream>
-#include <stdio.h>            // fprintf, etc...
+#include <cstdio>             // fprintf, etc...
 #include "GXmlText.hpp"
 
 /* __ Method name definitions ____________________________________________ */