--- trunk/pygtk/ascpy.i	2006/12/13 23:53:57	965
+++ trunk/pygtk/ascpy.i	2006/12/14 14:04:54	966
@@ -33,9 +33,13 @@
 #include "solverreporter.h"
 #include "incidencematrix.h"
 #include "registry.h"
-#include <compiler/importhandler.h>
 #include "annotation.h"
 
+extern "C"{
+#include <compiler/importhandler.h>
+#include <utilities/ascMalloc.h>
+}
+
 #ifdef ASC_WITH_DMALLOC
 # include <dmalloc.h>
 #endif
@@ -181,13 +185,7 @@
 	const short getFractionDenominator(const unsigned &) const;
 };
 
-class UnitsM{
-public:
-	UnitsM(const char *);
-	const SymChar getName() const; // the units description string eg 'bar' or 'kJ/kg/K'
-	const Dimensions getDimensions() const;
-	const double getConversion() const; // multiplication factor to convert eg feet to SI (metres)
-};
+%include "units.h"
 
 %extend UnitsM{
 	%pythoncode{
@@ -492,6 +490,14 @@
 	}
 }
 
+void shutdown();
+
+%{
+void shutdown(){
+	ascshutdown("Shutdown ASCEND...");
+}
+%}
+
 %include "solver.i"
 
 %include "extmethod.h"