Reorder/delete some headers and imports.

Author: skrah

dynd/include/types/type_functions.hpp

@@ -13,11 +13,6 @@
 #include <dynd/string_encodings.hpp>
 #include <dynd/type.hpp>
 
-#include "type_conversions.hpp"
-#include "numpy_interop.hpp"
-#include "visibility.hpp"
-
-#include <dynd/shape_tools.hpp>
 #include <dynd/types/bytes_type.hpp>
 #include <dynd/types/fixed_dim_type.hpp>
 #include <dynd/types/fixed_string_type.hpp>
@@ -26,6 +21,9 @@
 #include <dynd/types/type_type.hpp>
 
 #include "utility_functions.hpp"
+#include "type_conversions.hpp"
+#include "visibility.hpp"
+
 
 // Python's datetime C API
 #include "datetime.h"

dynd/include/types/type_unpack.hpp

@@ -7,9 +7,10 @@
 
 #include <Python.h>
 
-#include <dynd/type_registry.hpp>
 #include <type_traits>
 
+#include <dynd/type_registry.hpp>
+
 #include "pyobject_type.hpp"
 
 using namespace dynd;

dynd/ndt/type.pyx

@@ -76,7 +76,6 @@ cdef extern from 'types/type_functions.hpp' namespace 'pydynd':
 cdef extern from "types/type_unpack.hpp":
     object from_type_property(const pair[_type, const char *] &) except +translate_exception
 
-import numpy as _np
 
 builtin_tuple = tuple
 

dynd/src/types/type_deduction.cpp

@@ -15,10 +15,8 @@
 #include <dynd/types/type_type.hpp>
 #include <dynd/types/var_dim_type.hpp>
 
-#include "numpy_interop.hpp"
 #include "types/type_functions.hpp"
 #include "types/type_deduction.hpp"
-//#include "utility_functions.hpp"
 
 using namespace std;
 using namespace dynd;