diff -u -urN -x *~ necpp-1.4.0+cvs20091005.orig/src/c_geometry.cpp necpp-1.4.0+cvs20091005/src/c_geometry.cpp
--- necpp-1.4.0+cvs20091005.orig/src/c_geometry.cpp	Tue Jan  6 05:34:08 2009
+++ necpp-1.4.0+cvs20091005/src/c_geometry.cpp	Sun Nov 15 23:38:37 2009
@@ -16,12 +16,14 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+
 #include "c_geometry.h"
 
 #include "nec_context.h"
 #include "nec_exception.h"
-
-#include <cstring>
 
 c_geometry::c_geometry()
 {
diff -u -urN -x *~ necpp-1.4.0+cvs20091005.orig/src/nec_exception.cpp necpp-1.4.0+cvs20091005/src/nec_exception.cpp
--- necpp-1.4.0+cvs20091005.orig/src/nec_exception.cpp	Tue Dec  9 00:39:27 2008
+++ necpp-1.4.0+cvs20091005/src/nec_exception.cpp	Sun Nov 15 23:49:51 2009
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <cstdlib>
+#include <cstdarg>
 
 #include "safe_array.h"
 #include "nec_exception.h"
-#include "stdarg.h"
 
 using namespace std;